From 2525221b7fb245aa22df90898c6717a4b177a516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 5 Mar 2022 01:09:06 +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/service/XmProjectService.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 8159c32b..f6ae177d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -108,6 +108,12 @@ public class XmProjectService extends BaseService { xmProjectTo.setFromTplId(xmProjectDb.getId()); xmProjectTo.setBizFlowState("0"); xmProjectTo.setBizProcInstId(null); + xmProjectTo.setAdmUserid(user.getUserid()); + xmProjectTo.setAdmUsername(user.getUsername()); + xmProjectTo.setAssUserid(user.getUserid()); + xmProjectTo.setAssUsername(user.getUsername()); + xmProjectTo.setPmUserid(user.getUserid()); + xmProjectTo.setPmUsername(user.getUsername()); this.saveProject(xmProjectTo); XmProjectPhase phaseQuery=new XmProjectPhase(); @@ -136,6 +142,13 @@ public class XmProjectService extends BaseService { node.setBranchId(user.getBranchId()); node.setBizFlowState(""); node.setBizProcInstId(null); + node.setActRate(BigDecimal.ZERO); + node.setActInnerUserAt(BigDecimal.ZERO); + node.setActNouserAt(BigDecimal.ZERO); + node.setActOutUserAt(BigDecimal.ZERO); + node.setPhaseActInnerUserWorkload(BigDecimal.ZERO); + node.setPhaseActOutUserWorkload(BigDecimal.ZERO); + node.setPhaseActWorkload(BigDecimal.ZERO); } this.xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); this.xmProjectPhaseService.doBatchInsert(xmProjectPhases); @@ -163,6 +176,7 @@ public class XmProjectService extends BaseService { node.setCreateUserid(user.getUserid()); node.setCreateTime(new Date()); node.setProjectPhaseId(newPhaseIdMap.get(node.getProjectPhaseId())); + node.setPreTaskid(newTaskIdMap.get(node.getPreTaskid())); node.setIsTpl(isTpl); node.setMenuId(null); node.setMenuName(null); @@ -170,7 +184,11 @@ public class XmProjectService extends BaseService { node.setProductName(null); node.setExeUsernames(null); node.setExeUserids(null); - node.setPreTaskid(newTaskIdMap.get(node.getPreTaskid())); + node.setRate(BigDecimal.ZERO); + node.setActEndTime(null); + node.setActStartTime(null); + node.setExecutorUserid(null); + node.setExecutorUsername(null); } this.xmTaskService.parentIdPathsCalcBeforeSave(xmTasks); this.xmTaskService.batchImportFromTemplate(xmTasks);