From 4c61c18d63ce1d438b0882f95758a75e8b0cff85 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Fri, 8 Mar 2024 10:44:19 +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 --- .../sgzb/app/controller/TmTaskController.java | 21 ++++++++----------- .../app/service/impl/TmTaskServiceImpl.java | 6 +++--- 2 files changed, 12 insertions(+), 15 deletions(-) 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 5750a37d..aaf4f7d1 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 @@ -408,18 +408,15 @@ public class TmTaskController extends BaseController { } } - int size = leaseApplyInfoList.size(); - for (int n = 0; n < size; n++) { - List leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(n).getLeaseApplyDetails(); - if (leaseApplyDetails != null) { - List list1 = new ArrayList<>(); - for (int l = 0; l < leaseApplyDetails.size(); l++) { - if (leaseApplyDetails.get(l).getCount() == 1) { - list1.add(leaseApplyDetails.get(l)); - TmTask tmTask = leaseAuditList.get(i); - tmTask.getLeaseApplyInfoList().get(0).setLeaseApplyDetails(list1); - list.add(tmTask); - } + List leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(0).getLeaseApplyDetails(); + if (leaseApplyDetails != null) { + List list1 = new ArrayList<>(); + for (int l = 0; l < leaseApplyDetails.size(); l++) { + if (leaseApplyDetails.get(l).getCount() == 1) { + list1.add(leaseApplyDetails.get(l)); + TmTask tmTask = leaseAuditList.get(i); + tmTask.getLeaseApplyInfoList().get(0).setLeaseApplyDetails(list1); + list.add(tmTask); } } } 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 4eab4347..3c138dd1 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 @@ -700,7 +700,7 @@ public class TmTaskServiceImpl implements TmTaskService { } @Override - @Transactional(rollbackFor=Exception.class) + @Transactional(rollbackFor = Exception.class) public int edit(TmTask tmTask) { int flag = 0; int res = 0; @@ -711,12 +711,12 @@ public class TmTaskServiceImpl implements TmTaskService { } // 修改任务关联的协议 this.updateAgreementByTask(tmTask); - + //先删除leaseApplyDetail res = deletePreDetailData(tmTask); if (res == 0) { throw new RuntimeException("删除leaseApplyDetail异常"); } - //先删除leaseApplyInfo + //再删除leaseApplyInfo res = deletePreData(tmTask); if (res == 0) { throw new RuntimeException("删除leaseApplyInfo异常");