From b4ac803e1554f70e556d94a1313d6944e5fc0e6f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 11 二月 2025 17:29:35 +0800
Subject: [PATCH] 去除非空返回错误
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 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..5d0e9c0 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;
@@ -57,6 +58,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: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -1537,7 +1539,9 @@
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- dels.add(tjOrderDetail);
+ if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
+ dels.add(tjOrderDetail);
+ }
}
}
String summary = remark.getSummary();
@@ -1550,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());
@@ -1583,7 +1593,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 +1649,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 +1662,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 +1692,29 @@
parent.put("sone",dels);
maps.add(parent);
}
- return AjaxResult.success(maps);
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+
+
+ 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()){
+ 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 {
- return zongjianyishengchakanyichangxiangmu(tjNum);
+ List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
+// if(mapList.isEmpty()){
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+ return AjaxResult.success(mapList);
}
// return zongjianyishengchakanyichangxiangmu(tjNum);
@@ -1690,13 +1722,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 +1772,11 @@
parent.put("sone",dels);
list.add(parent);
}
- } else {
- return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
}
}
- return AjaxResult.success(list);
+
}
- return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ return list;
}
@GetMapping ("/chushenyemianchakanxiangmujieguo")
@@ -1779,11 +1805,12 @@
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();
}
}
- return AjaxResult.error();
+ return AjaxResult.success();
}
--
Gitblit v1.8.0