From 7e9ffbd3b45be78890442683b17742aa5bdccd2c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 25 七月 2025 17:55:26 +0800
Subject: [PATCH] zjh20250725-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 b4e2f98..f17511f 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
@@ -1413,9 +1413,12 @@
parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+
Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
.filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
.collect(Collectors.groupingBy(TjOrderDetail::getProResult));
+// null !=dictList &&
+
boolean isGroupOnce = false;
String groupOnceProResult = "";
if (listMap.size() == 1){
@@ -1423,8 +1426,8 @@
LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDictData::getDictType,"qj_type");
wrapper.eq(SysDictData::getDictLabel,firstKey);
- List<SysDictData> dictList = sysDictDataService.list();
- if (!dictList.isEmpty()) {
+ List<SysDictData> dictList = sysDictDataService.list(wrapper);
+ if (!dictList.isEmpty()) {
isGroupOnce = true;
groupOnceProResult = firstKey;
}
--
Gitblit v1.8.0