From 85271d93c28cb653bf4b314a7af5e44b2880eb2d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 08 五月 2025 10:43:13 +0800
Subject: [PATCH] 数据库备份记录
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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..7587c82 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();
@@ -613,22 +614,21 @@
wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
ycxmService.remove(wq);
if (detail.getExceptionDesc() == 1) {
+ String replacedAll = detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
if(!detail.getProName().contains("鑸掑紶鍘�") && !detail.getProName().contains("鏀剁缉鍘�")){
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
- , detail.getProResult());
+
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString(), replacedAll, "", order.getTjNumber()
+ , replacedAll, detail.getProResult());
String[] split = detail.getProResult().split("銆倈,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
// 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");
@@ -666,19 +666,15 @@
}else {
List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
- , detail.getProResult());
+ , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());
String[] split = detail.getProResult().split("銆倈,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
// 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 +691,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