From 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 23 一月 2025 17:07:51 +0800
Subject: [PATCH] zjh20250123
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 1333268..06c79bc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -57,6 +57,7 @@
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
import static org.jeecg.modules.jmreport.dyndb.util.b.a;
+import static org.jeecg.modules.jmreport.dyndb.util.b.e;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -1583,7 +1584,7 @@
@PostMapping ("/checkUpdateOrderRemark")
@ApiOperation (value = "鎬绘淇敼澶囨敞鎺ュ彛")
public AjaxResult checkUpdateOrderRemark(@RequestBody List<UpdateOrderRemarkVo> updateOrderRemarkVos) {
- if (null != updateOrderRemarkVos && updateOrderRemarkVos.size() > 0) {
+ if (null != updateOrderRemarkVos && !updateOrderRemarkVos.isEmpty()) {
for (UpdateOrderRemarkVo remarkVo : updateOrderRemarkVos) {
LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
wqm.eq(TjOrderRemark::getTjNumber, remarkVo.getTjNumber());
@@ -1639,6 +1640,12 @@
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
if (StrUtil.isNotBlank(tjNum)) {
+ TjOrder one = orderService.getOrderByTjNum(tjNum);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+
LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
wq.eq(TjOrderYcxm::getTjh,tjNum);
List<TjOrderYcxm> list = ycxmService.list(wq);
@@ -1646,13 +1653,9 @@
Collections.reverse(list);
Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
List<Map<String, Object>> maps = new ArrayList<>();
-
for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
-
Map<String, Object> parent = new HashMap<>();
-
List<TjOrderDetail> dels = new ArrayList<>();
-
for (TjOrderYcxm ycxm : entry.getValue()) {
TjOrderDetail detail=new TjOrderDetail();
detail.setProName(ycxm.getJcxm());
@@ -1680,9 +1683,24 @@
parent.put("sone",dels);
maps.add(parent);
}
- return AjaxResult.success(maps);
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+
+ List<Map<String, Object>> collect = maps.stream()
+ .filter(a -> mapList.stream()
+ .allMatch(b -> a.get("jyjc").equals(b.get("jyjc"))))
+ .collect(Collectors.toList());
+
+ if(!collect.isEmpty()){
+ mapList.addAll(collect);
+// return AjaxResult.success(result);
+ }
+ return AjaxResult.success(maps);
}else {
- return zongjianyishengchakanyichangxiangmu(tjNum);
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+ if(mapList.isEmpty()){
+ return AjaxResult.error("鏆傛棤鏁版嵁");
+ }
+ return AjaxResult.success(mapList);
}
// return zongjianyishengchakanyichangxiangmu(tjNum);
@@ -1690,13 +1708,9 @@
return AjaxResult.error();
}
- private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+ private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
// asyncService.updateCheckType(tjNumber);
- TjOrder one = orderService.getOrderByTjNum(tjNumber);
- if (one == null) {
- return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
- }
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
@@ -1744,13 +1758,11 @@
parent.put("sone",dels);
list.add(parent);
}
- } else {
- return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
}
}
- return AjaxResult.success(list);
+
}
- return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ return list;
}
@GetMapping ("/chushenyemianchakanxiangmujieguo")
@@ -1779,6 +1791,7 @@
for (TjOrderYcxm ycxm : ycxms) {
ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
}
+// List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList());
ycxmService.saveBatch(ycxms);
return AjaxResult.success();
}
--
Gitblit v1.8.0