From 672ce84d5ce6545a0e81709ea736c69cbbef8c1a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 24 四月 2025 18:12:47 +0800
Subject: [PATCH] zjh20250424
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 d2f35d8..d888fc2 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);
@@ -629,7 +629,7 @@
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
,"","",order.getTjNumber()
,detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","")
+ .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("鈼�","")
,detail.getProResult());
String[] split = detail.getProResult().split("銆倈,|锛�");
@@ -637,7 +637,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");
@@ -1742,17 +1742,32 @@
if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
if (null != project.getHisXmbm()) {
{
- mapJinchuan.add(project.getProParentId().toString());
- OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
- detailsDto.setMxfyxmbm(project.getHisXmbm());
+
if (project.getSfzhfy().equals("Y")) {
- detailsDto.setSfzhfy("1");
- } else {
- detailsDto.setSfzhfy("0");
+ mapJinchuan.add(project.getProParentId().toString());
+ OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+ detailsDto.setMxfyxmbm(project.getHisXmbm());
+ if (project.getSfzhfy().equals("Y")) {
+ detailsDto.setSfzhfy("1");
+ } else {
+ detailsDto.setSfzhfy("0");
+ }
+ detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
+ detailDtos.add(detailsDto);
}
- detailsDto.setSl(project.getSl());
- detailsDto.setProjg(project.getProPrice());
- detailDtos.add(detailsDto);
+
+// mapJinchuan.add(project.getProParentId().toString());
+// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+// detailsDto.setMxfyxmbm(project.getHisXmbm());
+// if (project.getSfzhfy().equals("Y")) {
+// detailsDto.setSfzhfy("1");
+// } else {
+// detailsDto.setSfzhfy("0");
+// }
+// detailsDto.setSl(project.getSl());
+// detailsDto.setProjg(project.getProPrice());
+// detailDtos.add(detailsDto);
}
}
List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
--
Gitblit v1.8.0