From a807cfe099406b061afafd53219bbacf71fcc9d9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 21 十月 2024 16:34:57 +0800
Subject: [PATCH] zjh20241021
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 4ff949f..d1e9395 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
@@ -805,6 +805,12 @@
} else {
// wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
+
+ //濡傛灉璇ラ」鐩瓨鍦� 鍒� 涓嶄繚瀛�
+
+ TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
+ if(null !=orderDetail) continue;
+
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
TjProject projectss = projectService.getById(projects.getProParentId());
@@ -844,11 +850,14 @@
}
}
- List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
- TjProject project = projectService.getById(item.getProId());
- return project != null && project.getProParentId() == 0;
- }).collect(Collectors.toList());
-// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
+// TjProject project = projectService.getById(item.getProId());
+// return project != null && project.getProParentId() == 0;
+// }).collect(Collectors.toList());
+//// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
+
tjOrderDetails = new ArrayList<>();
ArrayList<TjProject> jianChaProjects = new ArrayList<>();
@@ -1022,11 +1031,13 @@
}
}
}
- collect = tjOrderDetails.stream().filter(item -> {
- TjProject project = projectService.getById(item.getProId());
- return project != null && project.getProParentId() == 0;
- }).collect(Collectors.toList());
-// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// collect = tjOrderDetails.stream().filter(item -> {
+// TjProject project = projectService.getById(item.getProId());
+// return project != null && project.getProParentId() == 0;
+// }).collect(Collectors.toList());
+//// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+ List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ addCaiYangDengJi(detailLists,!detailLists.isEmpty(), order, sysUser,jxbz);
}
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1097,9 +1108,8 @@
ltkjJianchajianyanTreeService.save(tree);
}
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
-
- addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+// addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
}
}
--
Gitblit v1.8.0