From 381d61dc8fdb7af5bad14b2699137cafe31f4ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 19 Mar 2022 20:19:54 +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/XmProductService.java | 36 ---------------- .../com/xm/core/service/XmProjectService.java | 42 +------------------ 2 files changed, 1 insertion(+), 77 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java index d37e4889..ea6a730e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java @@ -140,41 +140,6 @@ public class XmProductService extends BaseService { xmProductTo.setProductName(xmProduct.getProductName()+"(复制)"); } this.insert(xmProductTo); - - - Map newPhaseIdMap=new HashMap<>(); - if("1".equals(xmProduct.getCopyPhase())){ - XmPhase phaseQuery=new XmPhase(); - phaseQuery.setProductId(xmProductDb.getId()); - List xmProjectPhases=this.xmProjectPhaseService.selectListByWhere(phaseQuery); - if(xmProjectPhases!=null && xmProjectPhases.size()>0){ - for (XmPhase node : xmProjectPhases) { - String id=this.xmProjectPhaseService.createKey("id"); - newPhaseIdMap.put(node.getId(),id); - } - for (XmPhase node : xmProjectPhases) { - String oldId=node.getId(); - String newId=newPhaseIdMap.get(oldId); - node.setProjectId(null); - node.setProductId(xmProductTo.getId()); - node.setId(newId); - if(StringUtils.hasText(node.getParentId())){ - node.setParentId(newPhaseIdMap.get(node.getParentId())); - } - - node.setCtime(new Date()); - node.setMngUserid(user.getUserid()); - node.setMngUsername(user.getUsername()); - node.setIsTpl(isTpl); - node.setBranchId(user.getBranchId()); - node.setBizFlowState(""); - node.setBizProcInstId(null); - } - this.xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); - this.xmProjectPhaseService.doBatchInsert(xmProjectPhases); - } - - } Map newMenuIdMap=new HashMap<>(); if("1".equals(xmProduct.getCopyMenu())){ XmMenu mq=new XmMenu(); @@ -191,7 +156,6 @@ public class XmProductService extends BaseService { node.setMenuId(newId); node.setProductId(xmProductTo.getId()); node.setPmenuId(newMenuIdMap.get(node.getPmenuId())); - node.setPhaseId(newPhaseIdMap.get(node.getPhaseId())); node.setCtime(new Date()); node.setMmUserid(user.getUserid()); node.setMmUsername(user.getUsername()); 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 ba5479b3..82928425 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 @@ -117,46 +117,7 @@ public class XmProjectService extends BaseService { xmProjectTo.setPmUsername(user.getUsername()); this.saveProject(xmProjectTo); - XmPhase phaseQuery=new XmPhase(); - phaseQuery.setProjectId(xmProjectDb.getId()); - Map newPhaseIdMap=new HashMap<>(); - if("1".equals(xmProject.getCopyPhase()) ||"1".equals(xmProject.getCopyTask())){ - List xmProjectPhases=this.xmProjectPhaseService.selectListByWhere(phaseQuery); - if(xmProjectPhases!=null && xmProjectPhases.size()>0){ - for (XmPhase node : xmProjectPhases) { - String id=this.xmProjectPhaseService.createKey("id"); - newPhaseIdMap.put(node.getId(),id); - } - for (XmPhase node : xmProjectPhases) { - String oldId=node.getId(); - String newId=newPhaseIdMap.get(oldId); - node.setProjectId(xmProjectTo.getId()); - node.setId(newId); - if(StringUtils.hasText(node.getParentId())){ - node.setParentId(newPhaseIdMap.get(node.getParentId())); - } - - node.setCtime(new Date()); - node.setMngUserid(user.getUserid()); - node.setMngUsername(user.getUsername()); - node.setIsTpl(isTpl); - node.setBranchId(user.getBranchId()); - node.setBizFlowState(""); - node.setBizProcInstId(null); - node.setActRate(BigDecimal.ZERO); - node.setActIuserAt(BigDecimal.ZERO); - node.setActNouserAt(BigDecimal.ZERO); - node.setActOuserAt(BigDecimal.ZERO); - node.setActIuserWorkload(BigDecimal.ZERO); - node.setActOuserWorkload(BigDecimal.ZERO); - node.setActWorkload(BigDecimal.ZERO); - } - this.xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); - this.xmProjectPhaseService.doBatchInsert(xmProjectPhases); - } - - } - if("1".equals(xmProject.getCopyTask()) && "1".equals(xmProject.getCopyPhase())){ + if("1".equals(xmProject.getCopyTask())){ XmTask taskQ=new XmTask(); taskQ.setProjectId(xmProjectDb.getId()); List xmTasks=this.xmTaskService.selectListByWhere(taskQ); @@ -176,7 +137,6 @@ public class XmProjectService extends BaseService { node.setCreateUsername(user.getUsername()); node.setCreateUserid(user.getUserid()); node.setCreateTime(new Date()); - node.setPhaseId(newPhaseIdMap.get(node.getPhaseId())); node.setPreTaskid(newTaskIdMap.get(node.getPreTaskid())); node.setIsTpl(isTpl); node.setMenuId(null);