From 89919412a7d94f87aea159b39d823e5d6014a20e Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 21 十月 2024 10:52:21 +0800 Subject: [PATCH] zjh20241021 --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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 78f47f3..4ff949f 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 @@ -848,7 +848,7 @@ TjProject project = projectService.getById(item.getProId()); return project != null && project.getProParentId() == 0; }).collect(Collectors.toList()); - addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz); +// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz); tjOrderDetails = new ArrayList<>(); ArrayList<TjProject> jianChaProjects = new ArrayList<>(); @@ -1026,7 +1026,7 @@ TjProject project = projectService.getById(item.getProId()); return project != null && project.getProParentId() == 0; }).collect(Collectors.toList()); - addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz); +// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz); } Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); @@ -1097,6 +1097,10 @@ ltkjJianchajianyanTreeService.save(tree); } + List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); + + addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz); + } } -- Gitblit v1.8.0