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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 564e90c..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();
@@ -611,6 +612,7 @@
LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
+ ycxmService.remove(wq);
if (detail.getExceptionDesc() == 1) {
if(!detail.getProName().contains("鑸掑紶鍘�") && !detail.getProName().contains("鏀剁缉鍘�")){
@@ -627,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");
@@ -677,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");
@@ -694,17 +696,16 @@
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 {
+ } else {
if(detail.getProName().contains("鑸掑紶鍘�") || detail.getProName().contains("鏀剁缉鍘�")){
ssyszys.append(detail.getProName()).append("/");
ssyszyjgs.append(detail.getProResult()).append("/");
}
- ycxmService.remove(wq);
+
}
}
--
Gitblit v1.8.0