From b35cb9c705dae9b8fd256c93f9c57dac678f3a6e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 20 二月 2025 15:10:01 +0800
Subject: [PATCH] zjh20250220
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 297284d..4b00216 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
@@ -1700,6 +1700,9 @@
.filter(b -> maps.stream()
.noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
.collect(Collectors.toList());
+
+
+
if(!collect.isEmpty()){
maps.addAll(collect);
}
@@ -1815,14 +1818,15 @@
String tjh = ycxms.get(0).getTjh();
if(StringUtils.isNotBlank(tjh)){
ycxmService.delOrderYcXmJyByTjh(tjh);
- String szyssy="";
- StringBuilder builders = new StringBuilder();
+// String szyssy="";
+// StringBuilder builders = new StringBuilder();
+// List<TjOrderYcxm> ycxmList=new ArrayList<>();
for (TjOrderYcxm ycxm : ycxms) {
ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
- if(ycxm.getJcxm().contains("鑸掑紶鍘�")||ycxm.getJcxm().contains("鏀剁缉鍘�")){
- builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" ");
- szyssy+=builders.toString();
- }
+// if(ycxm.getJcxm().contains("鑸掑紶鍘�")||ycxm.getJcxm().contains("鏀剁缉鍘�")){
+// builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" ");
+// szyssy+=builders.toString();
+// }
}
ycxmService.saveBatch(ycxms);
return AjaxResult.success();
--
Gitblit v1.8.0