diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java index a579d916..0288cb50 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java @@ -244,21 +244,17 @@ public class XmProductPhaseController { m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - BigDecimal zero=BigDecimal.ZERO; - String productId=xmProjectPhase.getProductId(); - BigDecimal phaseBudgetInnerUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetInnerUserAt(),zero); - BigDecimal phaseBudgetOutUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetOutUserAt(),zero); - BigDecimal phaseBudgetNouserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetNouserAt(),zero); - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); List excludePhaseIds=new ArrayList<>(); excludePhaseIds.add(xmProjectPhase.getId()); - if(!StringUtils.hasText(xmProjectPhase.getParentPhaseId())){//如果为顶级计划，预算不能大于产品总预算 - Tips judgetTips=xmProjectPhaseService.judgetProductBudget(productId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(!judgetTips.isOk()){ - return ResponseHelper.failed(judgetTips); - } - }else{ + xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); + if(xmProjectPhase.getLvl()==1){ + tips=xmProjectPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + }else { + tips=xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + } + if(!tips.isOk()){ + return ResponseHelper.failed(tips); + } XmProjectPhase parentDb=xmProjectPhaseService.selectOneObject(new XmProjectPhase(xmProjectPhase.getParentPhaseId())); if(parentDb==null){ return ResponseHelper.failed("p-no-exists","上级计划不存在"); @@ -266,14 +262,8 @@ public class XmProductPhaseController { if(!"1".equals(parentDb.getNtype())){ return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划"); } - Tips judgetTips=xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(!judgetTips.isOk()){ - return ResponseHelper.failed(judgetTips); - } - } - xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); xmProjectPhaseService.insert(xmProjectPhase); - xmRecordService.addProductPhaseRecord(productId, xmProjectPhase.getId(), "产品-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); + xmRecordService.addProductPhaseRecord(xmProduct.getId(), xmProjectPhase.getId(), "产品-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); m.put("data",xmProjectPhase); }catch (BizException e) { tips=e.getTips(); @@ -370,25 +360,20 @@ public class XmProductPhaseController { m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - String productId=null; - BigDecimal zero=BigDecimal.ZERO; - productId=xmProjectPhase.getProductId(); - BigDecimal phaseBudgetInnerUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetInnerUserAt(),zero); - BigDecimal phaseBudgetOutUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetOutUserAt(),zero); - BigDecimal phaseBudgetNouserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetNouserAt(),zero); - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); List excludePhaseIds=new ArrayList<>(); excludePhaseIds.add(xmProjectPhase.getId()); - Tips judgetTips=xmProjectPhaseService.judgetBudget(productId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(judgetTips.isOk()) { - xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); - xmProjectPhaseService.editByPk(xmProjectPhase); - xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), xmProjectPhase.getId(), "产品-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); - - }else { - tips=judgetTips; + if(xmProjectPhase.getLvl()==1){ + tips=this.xmProjectPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + }else{ + tips=this.xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + } + if(!tips.isOk()) { + return ResponseHelper.failed(tips); } + xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); + xmProjectPhaseService.editByPk(xmProjectPhase); + xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), xmProjectPhase.getId(), "产品-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); + m.put("data",xmProjectPhase); }catch (BizException e) { tips=e.getTips(); @@ -520,47 +505,74 @@ public class XmProductPhaseController { List groupVoList=groupService.getProductGroupVoList(xmProjectPhase.getProductId()); User user = LoginUtils.getCurrentUserInfo(); boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); + boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHeadOrAss(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是产品管理者，不允许批量导入计划"); m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - BigDecimal phaseBudgetInnerUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetOutUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetNouserAt=BigDecimal.ZERO; String productId=null; - BigDecimal zero=BigDecimal.ZERO; for (XmProjectPhase g : xmProjectPhases) { productId=g.getProductId(); g.setMngUserid(user.getUserid()); g.setMngUsername(user.getUsername()); - phaseBudgetInnerUserAt=phaseBudgetInnerUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetInnerUserAt(),zero)); - phaseBudgetOutUserAt=phaseBudgetOutUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetOutUserAt(),zero)); - phaseBudgetNouserAt=phaseBudgetNouserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetNouserAt(),zero)); - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); g=xmProjectPhaseService.autoCalcWorkload(g); - } - - Tips judgetTips=xmProjectPhaseService.judgetBudget(productId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,null); - if(judgetTips.isOk()) { + } + xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); + List l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList()); + if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下， + //找到导入的树中最上面的节点 + List noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList()); + //根据同一个父亲归类 + Map> map=new HashMap<>(); + for (XmProjectPhase noExist : noExists) { + List phases=map.get(noExist.getParentPhaseId()); + if(phases==null){ + phases=new ArrayList<>(); + map.put(noExist.getParentPhaseId(),phases); + } + phases.add(noExist); + } + for (Map.Entry> kv : map.entrySet()) { + String parentId=kv.getKey(); + List children=kv.getValue(); + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + List excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); + for (XmProjectPhase child : children) { + phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); + } + Tips tips2=xmProjectPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds); + if(!tips2.isOk()){ + tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】"); + return ResponseHelper.failed(tips2); + } + } + }else{//直接导入到产品之下，需要判断当前一级预算是否超出产品总预算 + BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + for (XmProjectPhase l1Phase : l1Phases) { + phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); + phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); + } + tips=xmProjectPhaseService.judgetProductBudget(productId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList())); + if(!tips.isOk()){ + return ResponseHelper.failed(tips); + } + } + if(tips.isOk()) { for (XmProjectPhase projectPhase : xmProjectPhases) { projectPhase.setMngUsername(user.getUsername()); projectPhase.setMngUserid(user.getUserid()); projectPhase.setCtime(new Date()); projectPhase.setLtime(new Date()); } - xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); - xmProjectPhaseService.doBatchInsert(xmProjectPhases); + xmProjectPhaseService.doBatchInsert(xmProjectPhases); for (XmProjectPhase phase : xmProjectPhases) { xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); } - }else { - tips=judgetTips; } }catch (BizException e) { @@ -600,26 +612,52 @@ public class XmProductPhaseController { m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - BigDecimal phaseBudgetInnerUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetOutUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetNouserAt=BigDecimal.ZERO; String productId=null; - BigDecimal zero=BigDecimal.ZERO; List excludePhaseIds=new ArrayList<>(); for (XmProjectPhase g : xmProjectPhases) { productId=g.getProductId(); - phaseBudgetInnerUserAt=phaseBudgetInnerUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetInnerUserAt(),zero)); - phaseBudgetOutUserAt=phaseBudgetOutUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetOutUserAt(),zero)); - phaseBudgetNouserAt=phaseBudgetNouserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetNouserAt(),zero)); g=xmProjectPhaseService.autoCalcWorkload(g); - - excludePhaseIds.add(g.getId()); - } - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); - - Tips judgetTips=xmProjectPhaseService.judgetBudget(productId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(judgetTips.isOk()) { + } + List l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList()); + if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下， + //找到导入的树中最上面的节点 + List noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList()); + //根据同一个父亲归类 + Map> map=new HashMap<>(); + for (XmProjectPhase noExist : noExists) { + List phases=map.get(noExist.getParentPhaseId()); + if(phases==null){ + phases=new ArrayList<>(); + map.put(noExist.getParentPhaseId(),phases); + } + phases.add(noExist); + } + for (Map.Entry> kv : map.entrySet()) { + String parentId=kv.getKey(); + List children=kv.getValue(); + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + List excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); + for (XmProjectPhase child : children) { + phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); + } + Tips tips2=xmProjectPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds); + if(!tips2.isOk()){ + tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】"); + return ResponseHelper.failed(tips2); + } + } + }else{//直接导入到产品之下，需要判断当前一级预算是否超出产品总预算 + BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + for (XmProjectPhase l1Phase : l1Phases) { + phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); + phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); + } + tips=xmProjectPhaseService.judgetProductBudget(productId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList())); + if(!tips.isOk()){ + return ResponseHelper.failed(tips); + } + } for (XmProjectPhaseVo projectPhase : xmProjectPhases) { if(!"1".equals(projectPhase.getNtype()) && !"add".equals(projectPhase.getOpType())&& !"addSub".equals(projectPhase.getOpType())){ @@ -641,9 +679,6 @@ public class XmProductPhaseController { xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); } - }else { - tips=judgetTips; - } }catch (BizException e) { tips=e.getTips(); 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 d9e46a13..deae551c 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 @@ -11,11 +11,9 @@ import com.mdp.qx.HasQx; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.PubTool; +import com.xm.core.entity.XmProject; import com.xm.core.entity.XmProjectPhase; -import com.xm.core.service.XmProjectGroupService; -import com.xm.core.service.XmProjectPhaseService; -import com.xm.core.service.XmProjectService; -import com.xm.core.service.XmRecordService; +import com.xm.core.service.*; import com.xm.core.vo.XmProjectGroupVo; import com.xm.core.vo.XmProjectPhaseVo; import io.swagger.annotations.*; @@ -46,72 +44,74 @@ import static com.mdp.core.utils.BaseUtils.map; @RequestMapping(value="/**/xm/core/xmProjectPhase") @Api(tags={"项目计划模板操作接口"}) public class XmProjectPhaseController { - + static Log logger=LogFactory.getLog(XmProjectPhaseController.class); - + @Autowired private XmProjectPhaseService xmProjectPhaseService; @Autowired private XmProjectGroupService groupService; - + @Autowired private XmProjectService xmProjectService; + + @Autowired - XmRecordService xmRecordService; - + XmRecordService xmRecordService; + @ApiOperation( value = "查询项目计划模板信息列表",notes="listXmProjectPhase,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value="计划主键,主键",required=false), - @ApiImplicitParam(name="phaseName",value="计划名称",required=false), - @ApiImplicitParam(name="remark",value="备注",required=false), - @ApiImplicitParam(name="parentPhaseId",value="上级计划编号",required=false), - @ApiImplicitParam(name="branchId",value="机构编号",required=false), - @ApiImplicitParam(name="projectId",value="当前项目编号",required=false), - @ApiImplicitParam(name="beginDate",value="开始时间",required=false), - @ApiImplicitParam(name="endDate",value="结束时间",required=false), - @ApiImplicitParam(name="phaseBudgetHours",value="工时(不包括下一级)-应该大于或等于task中总工时",required=false), - @ApiImplicitParam(name="phaseBudgetStaffNu",value="投入人员数(不包括下一级)-应该大于或等于task中总人数",required=false), - @ApiImplicitParam(name="ctime",value="创建时间",required=false), - @ApiImplicitParam(name="phaseBudgetNouserAt",value="非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本",required=false), - @ApiImplicitParam(name="phaseBudgetInnerUserAt",value="内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false), - @ApiImplicitParam(name="phaseBudgetOutUserAt",value="外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false), - @ApiImplicitParam(name="projectBaselineId",value="项目级基线",required=false), - @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false), - @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="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), - @ApiImplicitParam(name="seqNo",value="顺序号",required=false), - @ApiImplicitParam(name="phaseBudgetInnerUserWorkload",value="内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false), - @ApiImplicitParam(name="phaseBudgetOutUserWorkload",value="外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false), - @ApiImplicitParam(name="actNouserAt",value="实际非人力成本-来自任务表合计",required=false), - @ApiImplicitParam(name="actInnerUserAt",value="实际内部人力成本-来自任务表合计",required=false), - @ApiImplicitParam(name="phaseBudgetInnerUserPrice",value="内部人力成本单价元/人时",required=false), - @ApiImplicitParam(name="phaseBudgetOutUserPrice",value="外购人力成本单价元/人时",required=false), - @ApiImplicitParam(name="phaseBudgetOutUserCnt",value="外购人数",required=false), - @ApiImplicitParam(name="phaseBudgetInnerUserCnt",value="内部人数",required=false), - @ApiImplicitParam(name="actRate",value="实际进度0-100",required=false), - @ApiImplicitParam(name="phaseStatus",value="计划状态0初始1执行中2完工3关闭4删除中5已删除6暂停",required=false), - @ApiImplicitParam(name="actOutUserAt",value="实际外部人力成本",required=false), - @ApiImplicitParam(name="taskCnt",value="任务数",required=false), - @ApiImplicitParam(name="finishTaskCnt",value="完成的任务数",required=false), - @ApiImplicitParam(name="iterationCnt",value="迭代数",required=false), - @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), - @ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false), - @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), - @ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false), - @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) + @ApiImplicitParams({ + @ApiImplicitParam(name="id",value="计划主键,主键",required=false), + @ApiImplicitParam(name="phaseName",value="计划名称",required=false), + @ApiImplicitParam(name="remark",value="备注",required=false), + @ApiImplicitParam(name="parentPhaseId",value="上级计划编号",required=false), + @ApiImplicitParam(name="branchId",value="机构编号",required=false), + @ApiImplicitParam(name="projectId",value="当前项目编号",required=false), + @ApiImplicitParam(name="beginDate",value="开始时间",required=false), + @ApiImplicitParam(name="endDate",value="结束时间",required=false), + @ApiImplicitParam(name="phaseBudgetHours",value="工时(不包括下一级)-应该大于或等于task中总工时",required=false), + @ApiImplicitParam(name="phaseBudgetStaffNu",value="投入人员数(不包括下一级)-应该大于或等于task中总人数",required=false), + @ApiImplicitParam(name="ctime",value="创建时间",required=false), + @ApiImplicitParam(name="phaseBudgetNouserAt",value="非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本",required=false), + @ApiImplicitParam(name="phaseBudgetInnerUserAt",value="内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false), + @ApiImplicitParam(name="phaseBudgetOutUserAt",value="外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false), + @ApiImplicitParam(name="projectBaselineId",value="项目级基线",required=false), + @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false), + @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="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), + @ApiImplicitParam(name="seqNo",value="顺序号",required=false), + @ApiImplicitParam(name="phaseBudgetInnerUserWorkload",value="内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false), + @ApiImplicitParam(name="phaseBudgetOutUserWorkload",value="外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false), + @ApiImplicitParam(name="actNouserAt",value="实际非人力成本-来自任务表合计",required=false), + @ApiImplicitParam(name="actInnerUserAt",value="实际内部人力成本-来自任务表合计",required=false), + @ApiImplicitParam(name="phaseBudgetInnerUserPrice",value="内部人力成本单价元/人时",required=false), + @ApiImplicitParam(name="phaseBudgetOutUserPrice",value="外购人力成本单价元/人时",required=false), + @ApiImplicitParam(name="phaseBudgetOutUserCnt",value="外购人数",required=false), + @ApiImplicitParam(name="phaseBudgetInnerUserCnt",value="内部人数",required=false), + @ApiImplicitParam(name="actRate",value="实际进度0-100",required=false), + @ApiImplicitParam(name="phaseStatus",value="计划状态0初始1执行中2完工3关闭4删除中5已删除6暂停",required=false), + @ApiImplicitParam(name="actOutUserAt",value="实际外部人力成本",required=false), + @ApiImplicitParam(name="taskCnt",value="任务数",required=false), + @ApiImplicitParam(name="finishTaskCnt",value="完成的任务数",required=false), + @ApiImplicitParam(name="iterationCnt",value="迭代数",required=false), + @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), + @ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false), + @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), + @ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false), + @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response= XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectPhase( @RequestParam Map xmProjectPhase){ - Map m = new HashMap<>(); + Map m = new HashMap<>(); RequestUtils.transformArray(xmProjectPhase, "ids"); PageUtils.startPage(xmProjectPhase); List> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表 @@ -155,10 +155,6 @@ public class XmProjectPhaseController { tips.setFailureMsg("计划编号不能为空"); m.put("tips", tips); return m; - }else if(StringUtils.isEmpty(xmProjectPhase.getId())) { - tips.setFailureMsg("计划编号不能为空"); - m.put("tips", tips); - return m; }else{ XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId()); XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhaseQuery); @@ -167,9 +163,10 @@ public class XmProjectPhaseController { m.put("tips", tips); return m; } + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhaseDb.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhaseDb.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许设置计划负责人"); @@ -188,6 +185,7 @@ public class XmProjectPhaseController { xmProjectPhaseToUpdate.setMngUserid(xmProjectPhase.getMngUserid()); xmProjectPhaseToUpdate.setMngUsername(xmProjectPhase.getMngUsername()); this.xmProjectPhaseService.updateSomeFieldByPk(xmProjectPhaseToUpdate); + this.xmRecordService.addProjectPhaseRecord(xmProject.getId(),xmProjectPhase.getId(),"项目-计划-设置计划负责人","计划负责人由【"+xmProjectPhaseDb.getMngUsername()+"】变更为【"+xmProjectPhase.getMngUsername()+"】"); } } @@ -204,7 +202,7 @@ public class XmProjectPhaseController { @ApiOperation( value = "新增一条xm_project_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成") @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response=XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @HasQx(value = "xm_core_xmProjectPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/add",method=RequestMethod.POST) @@ -215,7 +213,7 @@ public class XmProjectPhaseController { if(StringUtils.isEmpty(xmProjectPhase.getId())) { xmProjectPhase.setId(xmProjectPhaseService.createKey("id")); }else{ - XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId()); + XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId()); if(xmProjectPhaseService.countByWhere(xmProjectPhaseQuery)>0){ tips.setFailureMsg("编号重复，请修改编号再提交"); m.put("tips", tips); @@ -227,9 +225,10 @@ public class XmProjectPhaseController { xmProjectPhase.setMngUserid(user.getUserid()); xmProjectPhase.setMngUsername(user.getUsername()); } + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许设置计划负责人"); @@ -242,52 +241,41 @@ public class XmProjectPhaseController { m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - String projectId=null; - BigDecimal zero=BigDecimal.ZERO; - projectId=xmProjectPhase.getProjectId(); - BigDecimal phaseBudgetInnerUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetInnerUserAt(),zero); - BigDecimal phaseBudgetOutUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetOutUserAt(),zero); - BigDecimal phaseBudgetNouserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetNouserAt(),zero); - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); List excludePhaseIds=new ArrayList<>(); excludePhaseIds.add(xmProjectPhase.getId()); - if(!StringUtils.hasText(xmProjectPhase.getParentPhaseId())){//如果为顶级计划，预算不能大于产品总预算 - Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(!judgetTips.isOk()){ - return ResponseHelper.failed(judgetTips); - } - }else{ - XmProjectPhase parentDb=xmProjectPhaseService.selectOneObject(new XmProjectPhase(xmProjectPhase.getParentPhaseId())); - if(parentDb==null){ - return ResponseHelper.failed("p-no-exists","上级计划不存在"); - } - if(!"1".equals(parentDb.getNtype())){ - return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划"); - } - Tips judgetTips=xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(!judgetTips.isOk()){ - return ResponseHelper.failed(judgetTips); - } + xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); + if(xmProjectPhase.getLvl()==1){ + tips=xmProjectPhaseService.judgetProjectBudget(xmProject.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + }else { + tips=xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + } + if(!tips.isOk()){ + return ResponseHelper.failed(tips); + } + XmProjectPhase parentDb=xmProjectPhaseService.selectOneObject(new XmProjectPhase(xmProjectPhase.getParentPhaseId())); + if(parentDb==null){ + return ResponseHelper.failed("p-no-exists","上级计划不存在"); } - xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); - xmProjectPhaseService.insert(xmProjectPhase); - xmRecordService.addProjectPhaseRecord(projectId, xmProjectPhase.getId(), "项目-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); - m.put("data",xmProjectPhase); - }catch (BizException e) { + if(!"1".equals(parentDb.getNtype())){ + return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划"); + } + xmProjectPhaseService.insert(xmProjectPhase); + xmRecordService.addProjectPhaseRecord(xmProject.getId(), xmProjectPhase.getId(), "项目-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); + m.put("data",xmProjectPhase); + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; - } + } /***/ @ApiOperation( value = "删除一条xm_project_phase信息",notes="delXmProjectPhase,仅需要上传主键字段") @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") + @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") }) @HasQx(value = "xm_core_xmProjectPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/del",method=RequestMethod.POST) @@ -295,9 +283,10 @@ public class XmProjectPhaseController { Map m = new HashMap<>(); Tips tips=new Tips("成功删除一条数据"); try{ + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许删除计划"); @@ -320,27 +309,27 @@ public class XmProjectPhaseController { tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除"); } else { xmProjectPhaseService.deleteByPk(xmProjectPhaseDb); - xmRecordService.addProjectPhaseRecord(xmProjectPhaseDb.getProjectId(), xmProjectPhaseDb.getId(), "项目-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),JSON.toJSONString(xmProjectPhaseDb),null); + xmRecordService.addProjectPhaseRecord(xmProjectPhaseDb.getProjectId(), xmProjectPhaseDb.getId(), "项目-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),"",JSON.toJSONString(xmProjectPhaseDb)); } } - - - }catch (BizException e) { + + + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; } - - + + /***/ @ApiOperation( value = "根据主键修改一条xm_project_phase信息",notes="editXmProjectPhase") @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response=XmProjectPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @HasQx(value = "xm_core_xmProjectPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/edit",method=RequestMethod.POST) @@ -348,9 +337,10 @@ public class XmProjectPhaseController { Map m = new HashMap<>(); Tips tips=new Tips("成功更新一条数据"); try{ + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许修改计划"); @@ -367,43 +357,38 @@ public class XmProjectPhaseController { m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - String projectId=null; - BigDecimal zero=BigDecimal.ZERO; - projectId=xmProjectPhase.getProjectId(); - BigDecimal phaseBudgetInnerUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetInnerUserAt(),zero); - BigDecimal phaseBudgetOutUserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetOutUserAt(),zero); - BigDecimal phaseBudgetNouserAt=NumberUtil.getBigDecimal(xmProjectPhase.getPhaseBudgetNouserAt(),zero); - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); List excludePhaseIds=new ArrayList<>(); excludePhaseIds.add(xmProjectPhase.getId()); - Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(judgetTips.isOk()) { - xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); - xmProjectPhaseService.editByPk(xmProjectPhase); - xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); - - }else { - tips=judgetTips; + if(xmProjectPhase.getLvl()==1){ + tips=this.xmProjectPhaseService.judgetProjectBudget(xmProject.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + }else{ + tips=this.xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds); + } + if(!tips.isOk()) { + return ResponseHelper.failed(tips); } + xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); + xmProjectPhaseService.editByPk(xmProjectPhase); + xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); + m.put("data",xmProjectPhase); - }catch (BizException e) { + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; } - - + + /***/ @ApiOperation( value = "根据主键列表批量删除xm_project_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") + @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @HasQx(value = "xm_core_xmProjectPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/batchDel",method=RequestMethod.POST) @@ -422,11 +407,12 @@ public class XmProjectPhaseController { m.put("tips", tips); return m; } + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List existsTaskList=new ArrayList<>(); List hasChildList=new ArrayList<>(); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许删除计划"); @@ -453,15 +439,17 @@ public class XmProjectPhaseController { List canDelNodes=new ArrayList<>(); for (XmProjectPhase phase : delPhases) { - boolean canDelAllChild =xmProjectPhaseService.checkCanDelAllChild(phase,delPhases); - if(!canDelAllChild) { - hasChildList.add(phase.getPhaseName()); - }else { - canDelNodes.add(phase); - } + boolean canDelAllChild =xmProjectPhaseService.checkCanDelAllChild(phase,delPhases); + if(!canDelAllChild) { + hasChildList.add(phase.getPhaseName()); + }else { + canDelNodes.add(phase); + } } if(canDelNodes.size()>0){ this.xmProjectPhaseService.doBatchDelete(canDelNodes); + xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), "", "项目-计划-批量删除计划", "批量删除计划"+canDelNodes.stream().map(i->i.getPhaseName()).collect(Collectors.joining(",")),"",JSON.toJSONString(canDelNodes)); + } List msgs=new ArrayList<>(); msgs.add("成功删除"+canDelNodes.size()+"条数据。"); @@ -480,29 +468,29 @@ public class XmProjectPhaseController { }else{ tips.setOkMsg(msgs.stream().collect(Collectors.joining(";\n"))); } - - - - }catch (BizException e) { + + + + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; - } + } /***/ @ApiOperation( value = "根据主键列表批量删除xm_project_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") + @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @HasQx(value = "xm_core_xmProjectPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST) public Map batchImportFromTemplate(@RequestBody List xmProjectPhases) { Map m = new HashMap<>(); - Tips tips=new Tips("成功导入"+xmProjectPhases.size()+"条数据"); + Tips tips=new Tips("成功导入"+xmProjectPhases.size()+"条数据"); try{ if(xmProjectPhases==null || xmProjectPhases.size()==0){ tips.setFailureMsg("计划不能为空"); @@ -510,72 +498,100 @@ public class XmProjectPhaseController { return m; } XmProjectPhase xmProjectPhase=xmProjectPhases.get(0); + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); + boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHeadOrAss(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许批量导入计划"); m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - BigDecimal phaseBudgetInnerUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetOutUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetNouserAt=BigDecimal.ZERO; String projectId=null; - BigDecimal zero=BigDecimal.ZERO; for (XmProjectPhase g : xmProjectPhases) { projectId=g.getProjectId(); g.setMngUserid(user.getUserid()); g.setMngUsername(user.getUsername()); - phaseBudgetInnerUserAt=phaseBudgetInnerUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetInnerUserAt(),zero)); - phaseBudgetOutUserAt=phaseBudgetOutUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetOutUserAt(),zero)); - phaseBudgetNouserAt=phaseBudgetNouserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetNouserAt(),zero)); - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); g=xmProjectPhaseService.autoCalcWorkload(g); - } - - Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,null); - if(judgetTips.isOk()) { + } + xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); + List l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList()); + if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下， + //找到导入的树中最上面的节点 + List noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList()); + //根据同一个父亲归类 + Map> map=new HashMap<>(); + for (XmProjectPhase noExist : noExists) { + List phases=map.get(noExist.getParentPhaseId()); + if(phases==null){ + phases=new ArrayList<>(); + map.put(noExist.getParentPhaseId(),phases); + } + phases.add(noExist); + } + for (Map.Entry> kv : map.entrySet()) { + String parentId=kv.getKey(); + List children=kv.getValue(); + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + List excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); + for (XmProjectPhase child : children) { + phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); + } + Tips tips2=xmProjectPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds); + if(!tips2.isOk()){ + tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】"); + return ResponseHelper.failed(tips2); + } + } + }else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 + BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + for (XmProjectPhase l1Phase : l1Phases) { + phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); + phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); + } + tips=xmProjectPhaseService.judgetProjectBudget(projectId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList())); + if(!tips.isOk()){ + return ResponseHelper.failed(tips); + } + } + if(tips.isOk()) { for (XmProjectPhase projectPhase : xmProjectPhases) { projectPhase.setMngUsername(user.getUsername()); projectPhase.setMngUserid(user.getUserid()); projectPhase.setCtime(new Date()); projectPhase.setLtime(new Date()); } - xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); xmProjectPhaseService.doBatchInsert(xmProjectPhases); for (XmProjectPhase phase : xmProjectPhases) { xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); - + } - }else { - tips=judgetTips; } - - }catch (BizException e) { + + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; - } + } /***/ @ApiOperation( value = "批量修改预算",notes="batchSaveBudget,仅需要上传主键字段") @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") + @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @HasQx(value = "xm_core_xmProjectPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST) public Map batchSaveBudget(@RequestBody List xmProjectPhases) { Map m = new HashMap<>(); - Tips tips=new Tips("成功修改"+xmProjectPhases.size()+"条数据"); + Tips tips=new Tips("成功修改"+xmProjectPhases.size()+"条数据"); try{ if(xmProjectPhases==null || xmProjectPhases.size()==0){ tips.setFailureMsg("计划不能为空"); @@ -583,107 +599,136 @@ public class XmProjectPhaseController { return m; } XmProjectPhase xmProjectPhase=xmProjectPhases.get(0); + XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许修改计划预算"); m.put("tips", tips); return m; } - BigDecimal phaseBudgetCost=BigDecimal.ZERO; - BigDecimal phaseBudgetInnerUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetOutUserAt=BigDecimal.ZERO; - BigDecimal phaseBudgetNouserAt=BigDecimal.ZERO; String projectId=null; - BigDecimal zero=BigDecimal.ZERO; List excludePhaseIds=new ArrayList<>(); for (XmProjectPhase g : xmProjectPhases) { projectId=g.getProjectId(); - phaseBudgetInnerUserAt=phaseBudgetInnerUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetInnerUserAt(),zero)); - phaseBudgetOutUserAt=phaseBudgetOutUserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetOutUserAt(),zero)); - phaseBudgetNouserAt=phaseBudgetNouserAt.add(NumberUtil.getBigDecimal(g.getPhaseBudgetNouserAt(),zero)); g=xmProjectPhaseService.autoCalcWorkload(g); - - excludePhaseIds.add(g.getId()); - } - phaseBudgetCost=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt); - - Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); - if(judgetTips.isOk()) { - - for (XmProjectPhaseVo projectPhase : xmProjectPhases) { - if(!"1".equals(projectPhase.getNtype()) && !"add".equals(projectPhase.getOpType())&& !"addSub".equals(projectPhase.getOpType())){ - if(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).findAny().isPresent()){ - return ResponseHelper.failed("p-ntype-no-1",projectPhase.getPhaseName()+"不是计划集,不允许下挂子计划"); - } + } + List l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList()); + if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下， + //找到导入的树中最上面的节点 + List noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList()); + //根据同一个父亲归类 + Map> map=new HashMap<>(); + for (XmProjectPhase noExist : noExists) { + List phases=map.get(noExist.getParentPhaseId()); + if(phases==null){ + phases=new ArrayList<>(); + map.put(noExist.getParentPhaseId(),phases); + } + phases.add(noExist); + } + for (Map.Entry> kv : map.entrySet()) { + String parentId=kv.getKey(); + List children=kv.getValue(); + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + List excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); + for (XmProjectPhase child : children) { + phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); } - if("add".equals(projectPhase.getOpType())||"addSub".equals(projectPhase.getOpType())){ - int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).count()+""); - if(childrenCnt>0){ - projectPhase.setChildrenCnt(childrenCnt); - projectPhase.setNtype("1"); - } + Tips tips2=xmProjectPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds); + if(!tips2.isOk()){ + tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】"); + return ResponseHelper.failed(tips2); } } - xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList())); - xmProjectPhaseService.batchInsertOrUpdate(xmProjectPhases); - for (XmProjectPhase phase : xmProjectPhases) { - xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); - + }else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 + BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; + BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; + for (XmProjectPhase l1Phase : l1Phases) { + phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); + phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); } - }else { - tips=judgetTips; + tips=xmProjectPhaseService.judgetProjectBudget(projectId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList())); + if(!tips.isOk()){ + return ResponseHelper.failed(tips); + } + } + + for (XmProjectPhaseVo projectPhase : xmProjectPhases) { + if(!"1".equals(projectPhase.getNtype()) && !"add".equals(projectPhase.getOpType())&& !"addSub".equals(projectPhase.getOpType())){ + if(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).findAny().isPresent()){ + return ResponseHelper.failed("p-ntype-no-1",projectPhase.getPhaseName()+"不是计划集,不允许下挂子计划"); + } + } + if("add".equals(projectPhase.getOpType())||"addSub".equals(projectPhase.getOpType())){ + int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).count()+""); + if(childrenCnt>0){ + projectPhase.setChildrenCnt(childrenCnt); + projectPhase.setNtype("1"); + } + } + } + xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList())); + xmProjectPhaseService.batchInsertOrUpdate(xmProjectPhases); + for (XmProjectPhase phase : xmProjectPhases) { + xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); + } - - }catch (BizException e) { + + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; - } + } @ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmProjectPhase") @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") + @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @HasQx(value = "xm_core_xmProjectPhase_loadTasksToXmProjectPhase",name = "计算各个计划对应的bug、task、测试案例等数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/loadTasksToXmProjectPhase",method=RequestMethod.POST) public Map loadTasksToXmProjectPhase(@RequestBody Map params) { Map m = new HashMap<>(); - Tips tips=new Tips("成功修改数据"); + Tips tips=new Tips("成功修改数据"); try{ String projectId=(String) params.get("projectId"); List groupVoList=groupService.getProjectGroupVoList(projectId); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + + XmProject xmProject=this.xmProjectService.getProjectFromCache(projectId); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许发起计划统计任务"); m.put("tips", tips); return m; } - int i= xmProjectPhaseService.loadTasksToXmProjectPhase((String) params.get("projectId")); - }catch (BizException e) { + int i= xmProjectPhaseService.loadTasksToXmProjectPhase(xmProject.getId()); + xmRecordService.addProjectPhaseRecord(xmProject.getId(), "", "项目-计划-汇总统计", "计算项目计划进度","",null); + + + }catch (BizException e) { tips=e.getTips(); logger.error("",e); }catch (Exception e) { tips.setFailureMsg(e.getMessage()); logger.error("",e); - } + } m.put("tips", tips); return m; } - @ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmProjectPhase") + @ApiOperation( value = "关键路径计算",notes="calcKeyPaths") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) - @HasQx(value = "xm_core_xmProjectPhase_loadTasksToXmProjectPhase",name = "计算各个计划对应的bug、task、测试案例等数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") + @HasQx(value = "xm_core_xmProjectPhase_calcKeyPaths",name = "关键路径计算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/calcKeyPaths",method=RequestMethod.POST) public Map calcKeyPaths(@RequestBody Map params) { Map m = new HashMap<>(); @@ -692,7 +737,9 @@ public class XmProjectPhaseController { String projectId=(String) params.get("projectId"); List groupVoList=groupService.getProjectGroupVoList(projectId); User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProjectManager(groupVoList,user.getUserid()); + + XmProject xmProject=this.xmProjectService.getProjectFromCache(projectId); + boolean meIsPm=groupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); if( !meIsPm && !meIsTeamHead ){ tips.setFailureMsg("您不是组长、也不是项目管理者，不允许发起关键路径计算任务"); @@ -700,6 +747,8 @@ public class XmProjectPhaseController { return m; } xmProjectPhaseService.calcKeyPaths((String) params.get("projectId")); + xmRecordService.addProjectPhaseRecord(xmProject.getId(), "", "项目-计划-关键路径计算", "计算项目计划关键路径","",null); + }catch (BizException e) { tips=e.getTips(); logger.error("",e); 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 d7adb9b0..7527c1ee 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 @@ -90,7 +90,7 @@ public class XmProjectPhaseService extends BaseService { * @param excludePhaseIds * @return */ - public Tips judgetBudget(String projectId,BigDecimal addPhaseBudgetCost,BigDecimal addPhaseBudgetInnerUserAt,BigDecimal addPhaseBudgetOutUserAt,BigDecimal addPhaseBudgetNouserAt,List excludePhaseIds){ + public Tips judgetProjectBudget(String projectId, BigDecimal addPhaseBudgetCost, BigDecimal addPhaseBudgetInnerUserAt, BigDecimal addPhaseBudgetOutUserAt, BigDecimal addPhaseBudgetNouserAt, List excludePhaseIds){ Tips tips=new Tips("检查预算成功"); Map g=this.selectTotalProjectAndPhaseBudgetCost(projectId,excludePhaseIds); BigDecimal phaseBudgetCost=BigDecimal.ZERO; @@ -575,5 +575,7 @@ public class XmProjectPhaseService extends BaseService { } return tips; } + + }