From 6e15fdc74abb44be1cedb2f71b6b25bec9c269d0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 11:11:04 +0800
Subject: [PATCH] zjh20250228
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 ec8118a..3f840e6 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
@@ -19,6 +19,8 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.mapper.TjOrderDetailMapper;
+import com.ltkj.hosp.mapper.TjOrderRemarkMapper;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
@@ -171,6 +173,12 @@
private ITjRulesService rulesService;
@Autowired
private ITjProAdvicerulesService tjProAdvicerulesService;
+
+ @Autowired
+ private TjOrderDetailMapper detailMapper;
+
+ @Autowired
+ private TjOrderRemarkMapper remarkMapper;
@@ -745,7 +753,10 @@
//濡傛灉璇ラ」鐩瓨鍦� 鍒� 涓嶄繚瀛�
TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
- if(null !=orderDetail) continue;
+// if(null !=orderDetail) continue;
+ if(null !=orderDetail) {
+ detailMapper.updateTjOrderDetailDel(orderDetail.getOrderDetailId().toString());
+ }
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
@@ -788,6 +799,12 @@
if(!projectList.isEmpty()){
List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
for (TjProject project : list) {
+
+ TjOrderRemark orderRemark = orderRemarkService.getTjOrderRemarkByTjNumAndProParentId(order.getTjNumber(), String.valueOf(project.getProId()));
+ if(null !=orderRemark){
+ remarkMapper.updateTjOrderRemarkdel(orderRemark.getRemarkId().toString());
+ }
+
TjOrderRemark tjOrderRemark = new TjOrderRemark();
tjOrderRemark.setProId(project.getProId());
tjOrderRemark.setProName(project.getProName());
@@ -801,6 +818,12 @@
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
+
+
+ TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), project.getProId().toString());
+ if(null !=orderDetail) {
+ detailMapper.updateTjOrderDetailDel(orderDetail.getOrderDetailId().toString());
+ }
TjOrderDetail detail1 = new TjOrderDetail();
detail1.setTjStatus(0L);
@@ -924,7 +947,7 @@
}
}
- List<String> mapJinchuan=null;
+ private static List<String> mapJinchuan=null;
public AjaxResult tijianbulushenqingJinchuanNew(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
mapJinchuan=new ArrayList<>();
tijianbulushenqingOld( customer,date, cardId, jxbz, jianChaProjects, isTuanTiPiao);
@@ -1489,7 +1512,7 @@
if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
if (null != project.getHisXmbm()) {
if (project.getSfzhfy().equals("Y")) {
- mapJinchuan.add(project.getProParentId().toString());
+ mapJinchuan.add(project.getProId().toString());
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
detailsDto.setMxfyxmbm(project.getHisXmbm());
if (project.getSfzhfy().equals("Y")) {
--
Gitblit v1.8.0