From 6c3fd8197118abf5f61ba9b4643addf8c15aaab9 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 24 十一月 2023 08:29:13 +0800
Subject: [PATCH] 回复
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 39a0fb8..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() && orderRemark.getSummaryList().size()>0 ) {
+ 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());
@@ -707,15 +713,20 @@
return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
}
- if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
- Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
- return AjaxResult.success(mapValue);
- }
+// 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);
@@ -877,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