From 47628f51c133023bb35206a586e51de63b2c15b1 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 15 May 2024 10:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=80=9A=E8=BF=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/TmTaskServiceImpl.java | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) 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 444f9a1c..57f50b38 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 @@ -92,19 +92,20 @@ public class TmTaskServiceImpl implements TmTaskService { // 再审核领料任务信息表 List leaseApplyInfoList = record.getLeaseApplyInfoList(); if (CollUtil.isNotEmpty(leaseApplyInfoList)) { - Integer companyId1 = leaseApplyInfoList.get(0).getCompanyId(); - List applyInfoList = new ArrayList<>(); - if (companyId1 != null && companyId1 == 101) { - applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList()); - } else if (companyId1 != null && companyId1 == 102) { - applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList()); - } - if (CollUtil.isNotEmpty(applyInfoList)) { - for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { - taskId = leaseApplyInfo.getTaskId(); - if (leaseApplyInfo != null) { + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + Integer companyId1 = leaseApplyInfo.getCompanyId(); + List applyInfoList = new ArrayList<>(); + if (companyId1 != null && companyId1 == 101) { + applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList()); + } else if (companyId1 != null && companyId1 == 102) { + applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList()); + } + if (CollUtil.isNotEmpty(applyInfoList)) { + for (LeaseApplyInfo applyInfo : applyInfoList) { + taskId = applyInfo.getTaskId(); //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); - result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(applyInfo); + } } } @@ -138,19 +139,19 @@ public class TmTaskServiceImpl implements TmTaskService { // 再审核领料任务信息表 List leaseApplyInfoList = record.getLeaseApplyInfoList(); if (CollUtil.isNotEmpty(leaseApplyInfoList)) { - Integer companyId1 = leaseApplyInfoList.get(0).getCompanyId(); - List applyInfoList = new ArrayList<>(); - if (companyId1 != null && companyId1 == 101) { - applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList()); - } else if (companyId1 != null && companyId1 == 102) { - applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList()); - } - if (CollUtil.isNotEmpty(applyInfoList)) { - for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { - taskId = leaseApplyInfo.getTaskId(); - if (leaseApplyInfo != null) { + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + Integer companyId1 = leaseApplyInfo.getCompanyId(); + List applyInfoList = new ArrayList<>(); + if (companyId1 != null && companyId1 == 101) { + applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList()); + } else if (companyId1 != null && companyId1 == 102) { + applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList()); + } + if (CollUtil.isNotEmpty(applyInfoList)) { + for (LeaseApplyInfo applyInfo : applyInfoList) { + taskId = applyInfo.getTaskId(); //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); - result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(applyInfo); } } }