From aacaa3d2daafbd97ab008908b9f2fe9ed6c1f713 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 30 四月 2025 17:17:42 +0800
Subject: [PATCH] pdf生成增加失败撤回
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index c4ba3ff..6054b1b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -594,6 +594,7 @@
} else {
deptname = dept.getDeptName();
}
+ String xb= tjCustomerService.getSexByTjh(order.getTjNumber());
StringBuilder ssyszys = new StringBuilder();
StringBuilder ssyszyjgs = new StringBuilder();
@@ -628,7 +629,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0");
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
if (null != mapss && !mapss.isEmpty()) {
Object bt = mapss.get("bt");
Object nr = mapss.get("nr");
@@ -678,7 +679,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0");
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
if (null != mapss && !mapss.isEmpty()) {
Object bt = mapss.get("bt");
Object nr = mapss.get("nr");
@@ -695,19 +696,17 @@
if (!mapList.isEmpty()) {
jianyilis.addAll(mapList);
}
- ssyszys.append(detail.getProName()).append("/");
- ssyszyjgs.append(detail.getProResult()).append("/");
-
+ ssyszys.append(detail.getProName()).append("/");
+ ssyszyjgs.append(detail.getProResult()).append("/");
}
+ } else {
+ if(detail.getProName().contains("鑸掑紶鍘�") || detail.getProName().contains("鏀剁缉鍘�")){
+ ssyszys.append(detail.getProName()).append("/");
+ ssyszyjgs.append(detail.getProResult()).append("/");
+
+ }
+
}
-// else {
-// if(detail.getProName().contains("鑸掑紶鍘�") || detail.getProName().contains("鏀剁缉鍘�")){
-// ssyszys.append(detail.getProName()).append("/");
-// ssyszyjgs.append(detail.getProResult()).append("/");
-//
-// }
-//
-// }
}
// 浣跨敤 stream 杩囨护鍑� proName 涓� "鑸掑紶鍘�" 鎴� "鏀剁缉鍘�" 鐨勫厓绱�
--
Gitblit v1.8.0