From 8cd6e88b041619993d734d028a5e6a0a2385a379 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 07 五月 2025 18:51:17 +0800
Subject: [PATCH] zjh20250507
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 bcaa9a3..dd09c23 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
@@ -608,7 +608,7 @@
}else {
deptname=dept.getDeptName();
}
-
+ String xb= tjCustomerService.getSexByTjh(order.getTjNumber());
for (TjOrderDetail detail : tjOrderDetailList) {
detail.setTjStatus(1L);
@@ -626,18 +626,19 @@
TjOrderYcxm ycxm = ycxmService.getOne(wq);
if(null !=ycxm){
ycxm.setJcjg(detail.getProResult());
+ String replacedAll = detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- ,"","",order.getTjNumber()
- ,detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","")
+ ,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");
--
Gitblit v1.8.0