From 2b1453e625b7f142956d487edcdca982b1cc753f Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期四, 31 十月 2024 10:06:33 +0800 Subject: [PATCH] 个人以及团体暂不写入采样管理 团体票自动合并并确认 --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 4 ++-- 1 files changed, 2 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 ac61768..c09fba6 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 @@ -828,7 +828,7 @@ } } - List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); + List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz); addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz); tjOrderDetails = new ArrayList<>(); @@ -995,7 +995,7 @@ // } } - List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); + List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz); addCaiYangDengJi(detailLists,!detailLists.isEmpty(), order, sysUser,jxbz); } -- Gitblit v1.8.0