diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java index 524ecae1..13d05d8d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java @@ -80,7 +80,7 @@ public class XmPhaseController { @ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false), @ApiImplicitParam(name="phaseBudgetWorkload",value="总工作量单位人时-应该大于或者等于task中的预算总工作量",required=false), @ApiImplicitParam(name="phaseActWorkload",value="已完成工作量单位人时-从task中的实际工作量算出",required=false), - @ApiImplicitParam(name="phaseActInnerUserWorkload",value="实际内部人力工作量-来自任务表合计",required=false), + @ApiImplicitParam(name="phaseActIuserWorkload",value="实际内部人力工作量-来自任务表合计",required=false), @ApiImplicitParam(name="phaseActOutUserWorkload",value="实际外购人力工作量-来自任务表合计",required=false), @ApiImplicitParam(name="taskType",value="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",required=false), @ApiImplicitParam(name="planType",value="计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年",required=false), diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index cc132660..b9072642 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -328,8 +328,8 @@ public class XmTaskController { return ResponseHelper.failed("projectId-0","项目编号不能为空"); } /** - if(!StringUtils.hasText(xmTaskVo.getProjectPhaseId())){ - return ResponseHelper.failed("ProjectPhaseId-0","项目计划编号不能为空"); + if(!StringUtils.hasText(xmTaskVo.getPhaseId())){ + return ResponseHelper.failed("PhaseId-0","项目计划编号不能为空"); } **/ User user=LoginUtils.getCurrentUserInfo(); @@ -644,7 +644,7 @@ public class XmTaskController { } } //改为服务处记录 - //xmRecordService.addXmTaskRecord(xmTaskVo.getProjectPhaseId(), xmTaskVo.getId(), "项目-任务-修改任务", "修改任务"+xmTaskVo.getName(),JSON.toJSONString(xmTaskVo),null); + //xmRecordService.addXmTaskRecord(xmTaskVo.getPhaseId(), xmTaskVo.getId(), "项目-任务-修改任务", "修改任务"+xmTaskVo.getName(),JSON.toJSONString(xmTaskVo),null); } m.put("data",xmTaskVo); }catch (BizException e) { @@ -893,7 +893,7 @@ public class XmTaskController { return ResponseHelper.failed("params-0","参数不能为空"); } - String projectPhaseId=tasksPhase.getProjectPhaseId(); + String projectPhaseId=tasksPhase.getPhaseId(); if( !StringUtils.hasText(projectPhaseId) ){ return ResponseHelper.failed("projectPhaseId-0","项目计划编号不能为空"); } @@ -945,7 +945,7 @@ public class XmTaskController { List msgs=new ArrayList<>(); if(allowTasks.size()>0){ BatchRelTasksWithPhase tasksWithPhase=new BatchRelTasksWithPhase(); - tasksWithPhase.setProjectPhaseId(projectPhaseId); + tasksWithPhase.setPhaseId(projectPhaseId); tasksWithPhase.setTaskIds(allowTasks.stream().map(i->i.getId()).collect(Collectors.toList())); xmTaskService.batchRelTasksWithPhase(tasksWithPhase); } diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java index 57655da5..feb59841 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java @@ -159,7 +159,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable { /** * 实际内购成本 **/ - public void setActInnerUserAt(BigDecimal actInnerUserAt) { + public void setActIuserAt(BigDecimal actInnerUserAt) { this.actInnerUserAt = actInnerUserAt; } /** @@ -183,7 +183,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable { /** * 实际内购工作量 **/ - public void setActInnerUserWorkload(BigDecimal actInnerUserWorkload) { + public void setActIuserWorkload(BigDecimal actInnerUserWorkload) { this.actInnerUserWorkload = actInnerUserWorkload; } /** @@ -280,7 +280,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable { /** * 实际内购成本 **/ - public BigDecimal getActInnerUserAt() { + public BigDecimal getActIuserAt() { return this.actInnerUserAt; } /** @@ -304,7 +304,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable { /** * 实际内购工作量 **/ - public BigDecimal getActInnerUserWorkload() { + public BigDecimal getActIuserWorkload() { return this.actInnerUserWorkload; } /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java index 323ff4e6..40e4cef6 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java @@ -123,7 +123,7 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable { /** * 计划 **/ - public void setProjectPhaseId(String projectPhaseId) { + public void setPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; } /** @@ -196,7 +196,7 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable { /** * 计划 **/ - public String getProjectPhaseId() { + public String getPhaseId() { return this.projectPhaseId; } /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java index cbe1d3af..1b63ead2 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java @@ -147,7 +147,7 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable { /** * 项目计划 **/ - public void setProjectPhaseId(String projectPhaseId) { + public void setPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; } /** @@ -232,7 +232,7 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable { /** * 项目计划 **/ - public String getProjectPhaseId() { + public String getPhaseId() { return this.projectPhaseId; } /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java index 786205af..5b7f749f 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java @@ -189,7 +189,7 @@ public class XmProjectMCostNouser implements java.io.Serializable { /** * 项目计划计划编号 **/ - public void setProjectPhaseId(String projectPhaseId) { + public void setPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; } /** @@ -322,7 +322,7 @@ public class XmProjectMCostNouser implements java.io.Serializable { /** * 项目计划计划编号 **/ - public String getProjectPhaseId() { + public String getPhaseId() { return this.projectPhaseId; } /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java index 11c1fc02..5e3a5676 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java @@ -213,7 +213,7 @@ public class XmProjectMCostUser implements java.io.Serializable { /** * 项目计划计划编号 **/ - public void setProjectPhaseId(String projectPhaseId) { + public void setPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; } /** @@ -382,7 +382,7 @@ public class XmProjectMCostUser implements java.io.Serializable { /** * 项目计划计划编号 **/ - public String getProjectPhaseId() { + public String getPhaseId() { return this.projectPhaseId; } /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java index facb8c36..544d7ee5 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java @@ -174,7 +174,7 @@ public class XmProjectTaskTypeState implements java.io.Serializable { /** * 实际内购成本 **/ - public void setActInnerUserAt(BigDecimal actInnerUserAt) { + public void setActIuserAt(BigDecimal actInnerUserAt) { this.actInnerUserAt = actInnerUserAt; } /** @@ -198,7 +198,7 @@ public class XmProjectTaskTypeState implements java.io.Serializable { /** * 实际内购工作量 **/ - public void setActInnerUserWorkload(BigDecimal actInnerUserWorkload) { + public void setActIuserWorkload(BigDecimal actInnerUserWorkload) { this.actInnerUserWorkload = actInnerUserWorkload; } /** @@ -301,7 +301,7 @@ public class XmProjectTaskTypeState implements java.io.Serializable { /** * 实际内购成本 **/ - public BigDecimal getActInnerUserAt() { + public BigDecimal getActIuserAt() { return this.actInnerUserAt; } /** @@ -325,7 +325,7 @@ public class XmProjectTaskTypeState implements java.io.Serializable { /** * 实际内购工作量 **/ - public BigDecimal getActInnerUserWorkload() { + public BigDecimal getActIuserWorkload() { return this.actInnerUserWorkload; } /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java index a0a4d6f8..c877ac96 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java @@ -263,7 +263,7 @@ public class XmTaskExecuser implements java.io.Serializable { /** * 计划编号 **/ - public void setProjectPhaseId(String projectPhaseId) { + public void setPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; } /** @@ -462,7 +462,7 @@ public class XmTaskExecuser implements java.io.Serializable { /** * 计划编号 **/ - public String getProjectPhaseId() { + public String getPhaseId() { return this.projectPhaseId; } /** 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 2790699a..8efaabb7 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 @@ -143,12 +143,12 @@ public class XmProjectService extends BaseService { node.setBizFlowState(""); node.setBizProcInstId(null); node.setActRate(BigDecimal.ZERO); - node.setActInnerUserAt(BigDecimal.ZERO); + node.setActIuserAt(BigDecimal.ZERO); node.setActNouserAt(BigDecimal.ZERO); node.setActOutUserAt(BigDecimal.ZERO); - node.setPhaseActInnerUserWorkload(BigDecimal.ZERO); - node.setPhaseActOutUserWorkload(BigDecimal.ZERO); - node.setPhaseActWorkload(BigDecimal.ZERO); + node.setActIuserWorkload(BigDecimal.ZERO); + node.setActOuserWorkload(BigDecimal.ZERO); + node.setActWorkload(BigDecimal.ZERO); } this.xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); this.xmProjectPhaseService.doBatchInsert(xmProjectPhases); @@ -175,7 +175,7 @@ public class XmProjectService extends BaseService { node.setCreateUsername(user.getUsername()); node.setCreateUserid(user.getUserid()); node.setCreateTime(new Date()); - node.setProjectPhaseId(newPhaseIdMap.get(node.getProjectPhaseId())); + node.setPhaseId(newPhaseIdMap.get(node.getPhaseId())); node.setPreTaskid(newTaskIdMap.get(node.getPreTaskid())); node.setIsTpl(isTpl); node.setMenuId(null); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index dd8fb387..0421e39f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -335,8 +335,7 @@ public class XmTaskExecuserService extends BaseService { costUser.setCreateTime(new Date()); costUser.setProjectId(xmTaskExecuser.getProjectId()); costUser.setProjectName(projectName); - costUser.setProjectName(task.getProjectName()); - costUser.setProjectPhaseId(task.getProjectName()); + costUser.setPhaseId(xmTaskExecuser.getPhaseId()); costUser.setId(this.xmProjectMCostUserService.createKey("id")); costUser.setExecuserProcInstId(execuserProcInstId); costUser.setExecuserStatus("0"); diff --git a/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java b/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java index d03a26be..1135efd8 100644 --- a/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java +++ b/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java @@ -8,11 +8,11 @@ public class BatchRelTasksWithPhase { List taskIds; - public String getProjectPhaseId() { + public String getPhaseId() { return projectPhaseId; } - public void setProjectPhaseId(String projectPhaseId) { + public void setPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; }