From 09549c55c10c8d47108397677ef9de9348b31326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 20 Feb 2022 04:24:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmProjectPhaseController.java | 1 + .../com/xm/core/service/XmProjectPhaseService.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index d0a38d4c..cf62536f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -372,6 +372,7 @@ public class XmProjectPhaseController { if(judgetTips.isOk()) { xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); xmProjectPhaseService.updateByPk(xmProjectPhase); + xmProjectPhaseService.sumParents(xmProjectPhase); xmRecordService.addXmPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); }else { diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java index a60ed92c..6f81aab6 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java @@ -65,7 +65,9 @@ public class XmProjectPhaseService extends BaseService { int i= super.insert(parameter); if(StringUtils.hasText(parameter.getParentPhaseId())){ this.updatePhaseChildrenCntByPhaseId(parameter.getParentPhaseId()); + sumParents(parameter); } + return i; } @@ -75,6 +77,7 @@ public class XmProjectPhaseService extends BaseService { int i= super.deleteByPk(parameter); if(StringUtils.hasText(parameter.getParentPhaseId())){ this.updatePhaseChildrenCntByPhaseId(parameter.getParentPhaseId()); + sumParents(parameter); } return i; } @@ -150,6 +153,7 @@ public class XmProjectPhaseService extends BaseService { list=list.stream().filter(i-> StringUtils.hasText(i.getParentPhaseId())).collect(Collectors.toList()); if(list.size()>0){ this.updateChildrenCntByIds(list.stream().map(i->i.getParentPhaseId()).collect(Collectors.toSet()).stream().collect(Collectors.toList())); + batchSumParents(batchValues); } return result; } @@ -218,6 +222,7 @@ public class XmProjectPhaseService extends BaseService { if(list.size()>0){ this.updateChildrenCntByIds(ids); } + this.batchSumParents(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList())); } public void calcKeyPaths(String projectId) { @@ -239,6 +244,7 @@ public class XmProjectPhaseService extends BaseService { if(list.size()>0){ this.updateChildrenCntByIds(list.stream().map(i->i.getParentPhaseId()).collect(Collectors.toSet()).stream().collect(Collectors.toList())); } + batchSumParents(xmProjectPhases); } @@ -349,7 +355,7 @@ public class XmProjectPhaseService extends BaseService { @Transactional - public void sumParents(XmTask node){ + public void sumParents(XmProjectPhase node){ String id=node.getId(); String pidPaths=node.getPidPaths(); if(!StringUtils.hasText(pidPaths)){ @@ -378,9 +384,9 @@ public class XmProjectPhaseService extends BaseService { } @Transactional - public void batchSumParents(List xmTasks) { + public void batchSumParents(List xmTasks) { List> list=new ArrayList<>(); - for (XmTask node : xmTasks) { + for (XmProjectPhase node : xmTasks) { String id=node.getId(); String pidPaths=node.getPidPaths(); if(!StringUtils.hasText(pidPaths)){