From 3f28b46171934066aeeff9af80d3f0ce6afb3adf Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 30 十一月 2023 17:55:27 +0800
Subject: [PATCH] 优化
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index f2e0ed6..c0280d0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -182,6 +182,8 @@
}
customer.setTjTime(order.getCreateTime());
customer.setTjNumber(order.getTjNumber());
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
customerLis.add(customer);
}
@@ -240,6 +242,8 @@
}
customer.setTjTime(order.getCreateTime());
customer.setTjNumber(order.getTjNumber());
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
list11111.add(customer);
}
}
@@ -313,6 +317,8 @@
}
customer.setTjTime(order.getCreateTime());
customer.setTjNumber(order.getTjNumber());
+ customer.setOrderId(orderId);
+ customer.setIsHz(order.getIsHz());
customer.setTjStatus(Long.valueOf(type));
List<TjOrderRemark> list = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
if (null != list && list.size() > 0) {
@@ -540,7 +546,8 @@
return AjaxResult.success("鎿嶄綔澶辫触");
}
for (TjOrderRemark orderRemark : remarklList) {
- if (null != orderRemark.getSummaryList()) {
+ List<String> summaryList = orderRemark.getSummaryList();
+ if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -581,7 +588,6 @@
}
}
}
- //-----------------------------------end
asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -600,7 +606,7 @@
remarkService.save(remark);
} else {
one.setRemark(orderRemark.getRemark());
- if (orderRemark.getSummaryList() != null) {
+ if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
one.setDeptId(orderRemark.getDeptId());
@@ -609,9 +615,11 @@
remarkService.updateById(one);
}
asyncService.updateCheckType(orderRemark.getTjNumber());
+ asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
asyncService.updateCheckType(orderRemark.getTjNumber());
+ asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -701,13 +709,24 @@
@ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
- TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
}
+
+// if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
+// Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
+// return AjaxResult.success(mapValue);
+// }
+
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
- if (null == proParentList) {
- return AjaxResult.error("璇ラ」鐩笅鏆傛椂娌℃暟鎹�");
+ if (null == proParentList || proParentList.size()==0) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("xiaoJieIds", null);
+ map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
+ map.put("xiaoJie", null);
+ map.put("remark", remark.getRemark());
+ return AjaxResult.success(map);
}
List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -720,16 +739,17 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject project = projectService.getById(tjOrderDetail.getProId());
//鐥呯鍥炴樉
- LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetailRules::getProId,project.getProId());
- wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
- List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
- List<TjRules> res=new ArrayList<>();
- for (TjOrderDetailRules orderDetailRules : list) {
- final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
- res.add(byId);
- }
- tjOrderDetail.setRulesList(res);
+// LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
+// wq.eq(TjOrderDetailRules::getProId,project.getProId());
+// wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
+// List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
+// List<TjRules> res=new ArrayList<>();
+// for (TjOrderDetailRules orderDetailRules : list) {
+// final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
+// res.add(byId);
+// }
+ List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
+ tjOrderDetail.setRulesList(rulesList);
//鏌ユ爣鍑嗗拰鍗曚綅----start
List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
@@ -791,10 +811,14 @@
List<TjAdvice> adviceList = new ArrayList<>();
if (null != remark) {
String[] strings = StringUtils.split(remark.getSummary(), ";");
- if (null != strings && strings.length > 0) {
- for (String string : strings) {
- adviceList.add(tjAdviceService.getById(string));
- }
+// if (null != strings && strings.length > 0) {
+// for (String string : strings) {
+// adviceList.add(tjAdviceService.getById(string));
+// }
+// }
+ if(null !=strings && strings.length>0){
+ List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
+ adviceList.addAll(list);
}
map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
} else {
@@ -803,6 +827,8 @@
map.put("sons", tjOrderDetails);
map.put("xiaoJie", adviceList);
map.put("remark", remark.getRemark());
+
+// asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
return AjaxResult.success(map);
}
@@ -862,4 +888,20 @@
return success(deptService.selectDeptTreeList(dept));
}
+
+ /**
+ * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
+ */
+ @GetMapping("/getChildList")
+ @ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
+ public AjaxResult getChildList(String deptName) {
+ LambdaQueryWrapper<SysDept> wq=new LambdaQueryWrapper<>();
+ wq.ne(SysDept::getParentId,0);
+ if (deptName!=null){
+ wq.like(SysDept::getDeptName,deptName);
+ }
+ List<SysDept> depts = deptService.list(wq);
+ return success(depts);
+ }
+
}
--
Gitblit v1.8.0