From 2b8f984cd8d13af3b15826567af36c79d65920f5 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 27 Feb 2024 14:34:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/app/controller/TmTaskController.java | 2 +- .../java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index aea8a9d3..92ee36c9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -471,7 +471,7 @@ public class TmTaskController extends BaseController { //修改领料任务表信息 //先判断 目前数据库有几个公司 - List list = tmTaskService.getListSome(task.getTaskId()); +// List list = tmTaskService.getListSome(task.getTaskId()); LeaseApplyInfo infoAdd = new LeaseApplyInfo(); /* if (list.size() < 2) { List> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId"); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 60655aa5..5cec965d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -793,6 +793,7 @@ public class TmTaskServiceImpl implements TmTaskService { // 去查询领料任务详情表 List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsByApply(leaseApplyInfo); if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); listLeaseDetails.addAll(leaseApplyDetails); } }