From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 06c79bc..efa6950 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
@@ -49,6 +49,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.Collator;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -1538,7 +1539,9 @@
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- dels.add(tjOrderDetail);
+ if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
+ dels.add(tjOrderDetail);
+ }
}
}
String summary = remark.getSummary();
@@ -1551,6 +1554,12 @@
if (dels.isEmpty()) {
continue;
}
+ dels=dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+ dels = dels.stream()
+ .sorted(Comparator.comparingInt(
+ tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+ ))
+ .collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -1658,6 +1667,7 @@
List<TjOrderDetail> dels = new ArrayList<>();
for (TjOrderYcxm ycxm : entry.getValue()) {
TjOrderDetail detail=new TjOrderDetail();
+ detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
detail.setProName(ycxm.getJcxm());
detail.setProResult(ycxm.getJcjg());
detail.setStanId(ycxm.getCkfw());
@@ -1685,27 +1695,39 @@
}
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());
+ List<Map<String, Object>> collect = mapList.stream()
+ .filter(b -> maps.stream()
+ .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
+ .collect(Collectors.toList());
if(!collect.isEmpty()){
- mapList.addAll(collect);
-// return AjaxResult.success(result);
+ maps.addAll(collect);
+ }
+ if(!maps.isEmpty()){
+ List<Map<String, Object>> collect1 = maps.stream()
+ .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
+ .collect(Collectors.toList());
+ return AjaxResult.success(collect1);
}
return AjaxResult.success(maps);
}else {
List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
- if(mapList.isEmpty()){
- return AjaxResult.error("鏆傛棤鏁版嵁");
- }
+// if(mapList.isEmpty()){
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
return AjaxResult.success(mapList);
}
// return zongjianyishengchakanyichangxiangmu(tjNum);
}
return AjaxResult.error();
+ }
+
+ @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
+ ycxmService.removeById(id);
+ return AjaxResult.success();
}
private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
@@ -1796,7 +1818,7 @@
return AjaxResult.success();
}
}
- return AjaxResult.error();
+ return AjaxResult.success();
}
--
Gitblit v1.8.0