From fd70070a9056415c7d9fd6cfedb7b7d6a8eaafcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 15 May 2022 23:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ctrl/XmIterationMenuController.java | 32 +- .../com/xm/core/ctrl/XmPhaseController.java | 857 ------------------ .../xm/core/ctrl/XmPhaseMenuController.java | 242 ----- .../core/ctrl/XmTaskExecuserController.java | 4 +- .../core/ctrl/XmTaskWorkloadController.java | 12 +- .../com/xm/core/service/XmRecordService.java | 106 ++- 6 files changed, 127 insertions(+), 1126 deletions(-) delete mode 100644 xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java delete mode 100644 xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java index 2d5efd0c..de992938 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java @@ -3,13 +3,12 @@ package com.xm.core.ctrl; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.utils.ResponseHelper; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.mdp.swagger.ApiEntityParams; import com.xm.core.entity.XmIteration; import com.xm.core.entity.XmMenu; -import com.xm.core.service.XmGroupService; -import com.xm.core.service.XmIterationService; -import com.xm.core.service.XmMenuService; -import com.xm.core.service.XmRecordService; +import com.xm.core.service.*; import com.xm.core.service.push.XmMenuPushMsgService; import com.xm.core.vo.XmIterationMenuVo; import io.swagger.annotations.*; @@ -52,6 +51,9 @@ public class XmIterationMenuController { @Autowired XmMenuService xmMenuService; + @Autowired + XmMenuOperQxService operQxService; + @Autowired XmIterationService xmIterationService; @@ -115,18 +117,17 @@ public class XmIterationMenuController { Map m = new HashMap<>(); Tips tips=new Tips("成功将用户故事移出迭代"); try{ + User user= LoginUtils.getCurrentUserInfo(); List menuIds=xmIterationMenus.getMenuIds(); if(menuIds==null || menuIds.size()==0){ return ResponseHelper.failed("menuIds-0","用户故事编号不能为空"); } - List menus=xmMenuService.selectListByIds(menuIds); + List menus=operQxService.getUserCanOpMenusByIds(menuIds,user.getUserid(),false); if(menus==null || menus.size()==0){ - return ResponseHelper.failed("menus-0","用户故事已不存在"); + return ResponseHelper.failed("menus-0","无权限操作"); } - List noQxOpList=new ArrayList<>(); - List canOpList=new ArrayList<>(); - groupService.calcCanOpMenus(menus,canOpList,noQxOpList); - List notJoins=new ArrayList<>(); + List canOpList=menus; + List notJoins=new ArrayList<>(); List status7=new ArrayList<>(); List canDels=new ArrayList<>(); for (XmMenu menu : canOpList) { @@ -173,7 +174,8 @@ public class XmIterationMenuController { public Map batchAddXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) { Map m = new HashMap<>(); Tips tips=new Tips("成功将用户故事发布到迭代中"); - try{ + try{ + User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmIterationMenus.getIterationId())){ return ResponseHelper.failed("iterationId-0","迭代编号不能为空"); } @@ -181,13 +183,11 @@ public class XmIterationMenuController { if(menuIds==null || menuIds.size()==0){ return ResponseHelper.failed("menuIds-0","用户故事编号不能为空"); } - List menus=xmMenuService.selectListByIds(menuIds); + List menus=operQxService.getUserCanOpMenusByIds(menuIds,user.getUserid(),false); if(menus==null || menus.size()==0){ - return ResponseHelper.failed("menus-0","用户故事已不存在"); + return ResponseHelper.failed("no-qx-0","无权限操作"); } - List noQxOpList=new ArrayList<>(); - List canOpList=new ArrayList<>(); - groupService.calcCanOpMenus(menus,canOpList,noQxOpList); + List canOpList=new ArrayList<>(); List hadJoin=new ArrayList<>(); List ntype1=new ArrayList<>(); List status789=new ArrayList<>(); 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 deleted file mode 100644 index 6540c99f..00000000 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java +++ /dev/null @@ -1,857 +0,0 @@ -package com.xm.core.ctrl; - -import com.alibaba.fastjson.JSON; -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; -import com.mdp.core.utils.NumberUtil; -import com.mdp.core.utils.RequestUtils; -import com.mdp.core.utils.ResponseHelper; -import com.mdp.mybatis.PageUtils; -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.XmPhase; -import com.xm.core.entity.XmProduct; -import com.xm.core.service.XmGroupService; -import com.xm.core.service.XmPhaseService; -import com.xm.core.service.XmProductService; -import com.xm.core.service.XmRecordService; -import com.xm.core.vo.XmGroupVo; -import io.swagger.annotations.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import static com.mdp.core.utils.BaseUtils.map; - -/** - * url编制采用rest风格,如对XM.xm_phase 项目计划模板的操作有增删改查,对应的url分别为:
- * 新增: xm/xmProjectPhase/add
- * 查询: xm/xmProjectPhase/list
- * 模糊查询: xm/xmProjectPhase/listKey
- * 修改: xm/xmProjectPhase/edit
- * 删除: xm/xmProjectPhase/del
- * 批量删除: xm/xmProjectPhase/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProjectPhase 表 XM.xm_phase 当前主键(包括多主键): id; - ***/ -@RestController("xm.core.xmPhaseController") -@RequestMapping(value="/**/xm/core/xmPhase") -@Api(tags={"项目计划模板操作接口"}) -public class XmPhaseController { - - static Log logger=LogFactory.getLog(XmPhaseController.class); - - @Autowired - private XmPhaseService xmPhaseService; - - @Autowired - private XmGroupService groupService; - - @Autowired - private XmProductService xmProductService; - - - @Autowired - XmRecordService xmRecordService; - - @ApiOperation( value = "查询项目计划模板信息列表",notes="listXmProductPhase,条件之间是 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="productId",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="phaseBudgetIuserAt",value="内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false), - @ApiImplicitParam(name="phaseBudgetOuserAt",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="phaseActIuserWorkload",value="实际内部人力工作量-来自任务表合计",required=false), - @ApiImplicitParam(name="phaseActOuserWorkload",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="phaseBudgetIuserWorkload",value="内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false), - @ApiImplicitParam(name="phaseBudgetOuserWorkload",value="外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false), - @ApiImplicitParam(name="actNouserAt",value="实际非人力成本-来自任务表合计",required=false), - @ApiImplicitParam(name="actIuserAt",value="实际内部人力成本-来自任务表合计",required=false), - @ApiImplicitParam(name="phaseBudgetIuserPrice",value="内部人力成本单价元/人时",required=false), - @ApiImplicitParam(name="phaseBudgetOuserPrice",value="外购人力成本单价元/人时",required=false), - @ApiImplicitParam(name="phaseBudgetOuserCnt",value="外购人数",required=false), - @ApiImplicitParam(name="phaseBudgetIuserCnt",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="actOuserAt",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="pageNum",value="当前页码,从1开始",required=false), - @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), - @ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student_id desc",required=false), - @ApiImplicitParam(name="count",value="是否进行总条数计算,count=true|false",required=false) - }) - @ApiResponses({ - @ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") - }) - @RequestMapping(value="/list",method=RequestMethod.GET) - public Map listXmProductPhase( @ApiIgnore @RequestParam Map xmProjectPhase){ - Map m = new HashMap<>(); - RequestUtils.transformArray(xmProjectPhase, "ids"); - PageUtils.startPage(xmProjectPhase); - List> xmProjectPhaseList = xmPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表 - PageUtils.responePage(m, xmProjectPhaseList); - if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){ - Set pidPathsSet=new HashSet<>(); - Set idSet=new HashSet<>(); - for (Map map : xmProjectPhaseList) { - String id= (String) map.get("id"); - idSet.add(id); - String pidPaths= (String) map.get("pidPaths"); - pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths==null || pidPaths.length()<=2){ - continue; - } - pidPathsSet.add(pidPaths); - } - if(pidPathsSet!=null && pidPathsSet.size()>0){ - List> parentList= xmPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); - if(parentList!=null && parentList.size()>0){ - xmProjectPhaseList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); - } - } - } - m.put("data",xmProjectPhaseList); - Tips tips=new Tips("查询成功"); - m.put("tips", tips); - return m; - } - - - @HasQx(value = "xm_core_xmPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/setPhaseMngUser",method=RequestMethod.POST) - public Map setPhaseMngUser(@RequestBody XmPhase xmProjectPhase) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功设置"); - try{ - if(StringUtils.isEmpty(xmProjectPhase.getId())) { - tips.setFailureMsg("计划编号不能为空"); - m.put("tips", tips); - return m; - }else{ - XmPhase xmProjectPhaseQuery = new XmPhase(xmProjectPhase.getId()); - XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhaseQuery); - if(xmProjectPhaseDb==null){ - tips.setFailureMsg("计划不存在"); - m.put("tips", tips); - return m; - } - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhaseDb.getProductId()); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhaseDb.getProductId()); - User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许设置计划负责人"); - m.put("tips", tips); - return m; - } - boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,xmProjectPhase.getMngUserid(),user.getUserid()); - if( !meIsPm && !meIsHisTeamHead ){ - tips.setFailureMsg("您不是"+xmProjectPhase.getMngUsername()+"的组长，不允许设置其为计划负责人"); - m.put("tips", tips); - return m; - } - if(tips.isOk()){ - XmPhase xmProjectPhaseToUpdate=new XmPhase(); - xmProjectPhaseToUpdate.setId(xmProjectPhase.getId()); - xmProjectPhaseToUpdate.setMngUserid(xmProjectPhase.getMngUserid()); - xmProjectPhaseToUpdate.setMngUsername(xmProjectPhase.getMngUsername()); - this.xmPhaseService.updateSomeFieldByPk(xmProjectPhaseToUpdate); - this.xmRecordService.addProductPhaseRecord(xmProduct.getId(),xmProjectPhase.getId(),"产品-计划-设置计划负责人","计划负责人由【"+xmProjectPhaseDb.getMngUsername()+"】变更为【"+xmProjectPhase.getMngUsername()+"】"); - } - } - - }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_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成") - @ApiResponses({ - @ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @HasQx(value = "xm_core_xmPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/add",method=RequestMethod.POST) - public Map addXmProjectPhase(@RequestBody XmPhase xmProjectPhase) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功新增一条数据"); - try{ - if(!StringUtils.hasText(xmProjectPhase.getProductId())){ - return ResponseHelper.failed("productId-0","请上送项目编号"); - } - if(StringUtils.isEmpty(xmProjectPhase.getId())) { - xmProjectPhase.setId(xmPhaseService.createKey("id")); - }else{ - XmPhase xmProjectPhaseQuery = new XmPhase(xmProjectPhase.getId()); - if(xmPhaseService.countByWhere(xmProjectPhaseQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; - } - } - User user = LoginUtils.getCurrentUserInfo(); - if(!StringUtils.hasText(xmProjectPhase.getMngUserid())){ - xmProjectPhase.setMngUserid(user.getUserid()); - xmProjectPhase.setMngUsername(user.getUsername()); - } - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhase.getProductId()); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProductId()); - - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许设置计划负责人"); - m.put("tips", tips); - return m; - } - boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,xmProjectPhase.getMngUserid(),user.getUserid()); - if( !meIsPm && !meIsHisTeamHead ){ - tips.setFailureMsg("您不是"+xmProjectPhase.getMngUsername()+"的组长，不允许设置其为计划负责人"); - m.put("tips", tips); - return m; - } - List excludePhaseIds=new ArrayList<>(); - excludePhaseIds.add(xmProjectPhase.getId()); - xmPhaseService.calcPhaseBudgetAmount(xmProjectPhase); - xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); - if(xmProjectPhase.getLvl()==1){ - if("1".equals(xmProduct.getBudgetCtrl())){ - tips= xmPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getBudgetAt(),null,null,null,excludePhaseIds); - } - }else { - if("1".equals(xmProduct.getPhaseBudgetCtrl())) { - tips = xmPhaseService.judgetPhaseBudget(xmProjectPhase.getParentId(), xmProjectPhase.getBudgetAt(), null, null, null, excludePhaseIds); - } - } - if(!tips.isOk()){ - return ResponseHelper.failed(tips); - } - XmPhase parentDb= xmPhaseService.selectOneObject(new XmPhase(xmProjectPhase.getParentId())); - if(parentDb==null){ - return ResponseHelper.failed("p-no-exists","上级计划不存在"); - } - if(!"1".equals(parentDb.getNtype())){ - return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getName()+"】不是计划集，不能在其之下建立子计划"); - } - xmPhaseService.insert(xmProjectPhase); - xmRecordService.addProductPhaseRecord(xmProduct.getId(), xmProjectPhase.getId(), "产品-计划-新增计划", "新增计划"+xmProjectPhase.getName(),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_phase信息",notes="delXmProjectPhase,仅需要上传主键字段") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") - }) - @HasQx(value = "xm_core_xmPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/del",method=RequestMethod.POST) - public Map delXmProjectPhase(@RequestBody XmPhase xmProjectPhase){ - Map m = new HashMap<>(); - Tips tips=new Tips("成功删除一条数据"); - try{ - if(!StringUtils.hasText(xmProjectPhase.getId())){ - return ResponseHelper.failed("id-0","请上送计划编号"); - } - XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhase); - if(xmProjectPhaseDb==null){ - return ResponseHelper.failed("data-0","该计划已不存在"); - } - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhaseDb.getProductId()); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhaseDb.getProductId()); - User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许删除计划"); - m.put("tips", tips); - return m; - } - boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,xmProjectPhaseDb.getMngUserid(),user.getUserid()); - if( !meIsPm && !meIsHisTeamHead ){ - tips.setFailureMsg("您不是"+xmProjectPhaseDb.getMngUsername()+"的组长，不允许删除其负责的计划"); - m.put("tips", tips); - return m; - } - //检查是否由关联的任务，有则不允许删除 - Long exists=this.xmPhaseService.checkExistsTask(xmProjectPhase.getId()); - if(exists>0) { - tips.setFailureMsg("存在"+exists+"条任务,不允许删除"); - }else { - - if(xmProjectPhaseDb.getChildrenCnt()!=null && xmProjectPhaseDb.getChildrenCnt()>0){ - tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除"); - } else { - xmPhaseService.deleteByPk(xmProjectPhaseDb); - xmRecordService.addProductPhaseRecord(xmProjectPhaseDb.getProductId(), xmProjectPhaseDb.getId(), "产品-计划-删除计划", "删除计划"+xmProjectPhaseDb.getName(),"",JSON.toJSONString(xmProjectPhaseDb)); - } - } - - - }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_phase信息",notes="editXmProjectPhase") - @ApiResponses({ - @ApiResponse(code = 200,response= XmPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") - }) - @HasQx(value = "xm_core_xmPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/edit",method=RequestMethod.POST) - public Map editXmProjectPhase(@RequestBody XmPhase xmProjectPhase) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功更新一条数据"); - try{ - if(!StringUtils.hasText(xmProjectPhase.getId())){ - return ResponseHelper.failed("id-0","请上送计划编号"); - } - XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhase); - if(xmProjectPhaseDb==null){ - return ResponseHelper.failed("data-0","该计划已不存在"); - } - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhase.getProductId()); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProductId()); - User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许修改计划"); - m.put("tips", tips); - return m; - } - if(!StringUtils.hasText(xmProjectPhase.getMngUserid())){ - xmProjectPhase.setMngUserid(user.getUserid()); - xmProjectPhase.setMngUsername(user.getUsername()); - } - boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,xmProjectPhase.getMngUserid(),user.getUserid()); - if( !meIsPm && !meIsHisTeamHead ){ - tips.setFailureMsg("您不是"+xmProjectPhase.getMngUsername()+"的组长，不允许修改其负责的计划"); - m.put("tips", tips); - return m; - } - xmProjectPhase= xmPhaseService.autoCalcWorkload(xmProjectPhase); - xmPhaseService.calcPhaseBudgetAmount(xmProjectPhase); - List excludePhaseIds=new ArrayList<>(); - excludePhaseIds.add(xmProjectPhase.getId()); - - //如果修改了预算数据，才进行预算判断 - if(xmProjectPhaseDb.getBudgetAt()!=null && xmProjectPhaseDb.getBudgetAt().compareTo(xmProjectPhase.getBudgetAt())!=0){ - if(xmProjectPhase.getLvl()==1){ - if("1".equals(xmProduct.getBudgetCtrl())){ - tips=this.xmPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getBudgetAt(),null,null,null,excludePhaseIds); - } - }else{ - if("1".equals(xmProduct.getPhaseBudgetCtrl())) { - tips = this.xmPhaseService.judgetPhaseBudget(xmProjectPhase.getParentId(), xmProjectPhase.getBudgetAt(), null, null, null, excludePhaseIds); - } - } - - } - if(!tips.isOk()) { - return ResponseHelper.failed(tips); - } - xmPhaseService.editByPk(xmProjectPhase); - xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), xmProjectPhase.getId(), "产品-计划-修改计划", "修改计划"+xmProjectPhase.getName(),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_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @HasQx(value = "xm_core_xmPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Map batchDelXmProjectPhase(@RequestBody List xmProjectPhases) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功删除"+(xmProjectPhases==null?0:xmProjectPhases.size())+"条数据"); - try{ - if(xmProjectPhases==null || xmProjectPhases.size()==0){ - tips.setFailureMsg("计划不能为空"); - m.put("tips", tips); - return m; - } - XmPhase xmProjectPhase=xmProjectPhases.get(0); - if(!StringUtils.hasText(xmProjectPhase.getProductId())){ - tips.setFailureMsg("项目编号不能为空"); - m.put("tips", tips); - return m; - } - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhase.getProductId()); - List existsTaskList=new ArrayList<>(); - List hasChildList=new ArrayList<>(); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProductId()); - User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许删除计划"); - m.put("tips", tips); - return m; - } - List noQxUsernames=new ArrayList<>(); - List delPhases=new ArrayList<>(); - List xmProjectPhaseListDb=this.xmPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList())); - for (XmPhase phase : xmProjectPhaseListDb) { - boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,phase.getMngUserid(),user.getUserid()); - if( !meIsPm && !meIsHisTeamHead ){ - noQxUsernames.add(phase.getMngUsername()); - continue; - } - //检查是否由关联的任务，有则不允许删除 - Long exists=this.xmPhaseService.checkExistsTask(phase.getId()); - if(exists>0) { - existsTaskList.add(phase.getName()); - }else { - delPhases.add(phase); - } - } - List canDelNodes=new ArrayList<>(); - for (XmPhase phase : delPhases) { - - boolean canDelAllChild = xmPhaseService.checkCanDelAllChild(phase,delPhases); - if(!canDelAllChild) { - hasChildList.add(phase.getName()); - }else { - canDelNodes.add(phase); - } - } - if(canDelNodes.size()>0){ - this.xmPhaseService.doBatchDelete(canDelNodes); - xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), "", "产品-计划-批量删除计划", "批量删除计划"+canDelNodes.stream().map(i->i.getName()).collect(Collectors.joining(",")),"",JSON.toJSONString(canDelNodes)); - - } - List msgs=new ArrayList<>(); - msgs.add("成功删除"+canDelNodes.size()+"条数据。"); - if(noQxUsernames.size()>0){ - msgs.add("您无权删除以下人员所负责的计划【"+StringUtils.arrayToCommaDelimitedString(noQxUsernames.toArray())+"】"); - } - if(hasChildList.size()>0){ - msgs.add("以下计划存在子计划，不允许删除。【"+hasChildList.stream().collect(Collectors.joining(","))+"】"); - } - - if(existsTaskList.size()>0){ - msgs.add("以下计划存在关联的任务，不允许删除。【"+existsTaskList.stream().collect(Collectors.joining(","))+"】"); - } - if(canDelNodes.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); - }else{ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); - } - - - - }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_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @HasQx(value = "xm_core_xmPhase_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()+"条数据"); - try{ - if(xmProjectPhases==null || xmProjectPhases.size()==0){ - tips.setFailureMsg("计划不能为空"); - m.put("tips", tips); - return m; - } - XmPhase xmProjectPhase=xmProjectPhases.get(0); - - if(!StringUtils.hasText(xmProjectPhase.getProductId())){ - return ResponseHelper.failed("productId-0","请上送项目编号"); - } - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhase.getProductId()); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProductId()); - User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHeadOrAss(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许批量导入计划"); - m.put("tips", tips); - return m; - } - String productId=null; - for (XmPhase g : xmProjectPhases) { - productId=g.getProductId(); - g.setMngUserid(user.getUserid()); - g.setMngUsername(user.getUsername()); - g= xmPhaseService.autoCalcWorkload(g); - xmPhaseService.calcPhaseBudgetAmount(g); - - } - xmPhaseService.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.getParentId())).findAny().isPresent()).collect(Collectors.toList()); - //根据同一个父亲归类 - Map> map=new HashMap<>(); - for (XmPhase noExist : noExists) { - List phases=map.get(noExist.getParentId()); - if(phases==null){ - phases=new ArrayList<>(); - map.put(noExist.getParentId(),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 (XmPhase child : children) { - phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getBudgetAt()); - } - if("1".equals(xmProduct.getPhaseBudgetCtrl())){ - Tips tips2= xmPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds); - if(!tips2.isOk()){ - tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); - return ResponseHelper.failed(tips2); - } - } - } - }else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 - BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; - BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; - for (XmPhase l1Phase : l1Phases) { - phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getBudgetWorkload()); - phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getBudgetAt()); - } - if("1".equals(xmProduct.getBudgetCtrl())) { - tips = xmPhaseService.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 (XmPhase projectPhase : xmProjectPhases) { - projectPhase.setMngUsername(user.getUsername()); - projectPhase.setMngUserid(user.getUserid()); - projectPhase.setCtime(new Date()); - projectPhase.setLtime(new Date()); - } - xmPhaseService.doBatchInsert(xmProjectPhases); - - for (XmPhase phase : xmProjectPhases) { - xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-新增计划", "新增计划"+phase.getName(),JSON.toJSONString(phase),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 = "批量修改预算",notes="batchSaveBudget,仅需要上传主键字段") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @HasQx(value = "xm_core_xmPhase_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()+"条数据"); - try{ - if(xmProjectPhases==null || xmProjectPhases.size()==0){ - tips.setFailureMsg("计划不能为空"); - m.put("tips", tips); - return m; - } - XmPhase xmProjectPhase=xmProjectPhases.get(0); - if(!StringUtils.hasText(xmProjectPhase.getProductId())){ - return ResponseHelper.failed("productId-0","请上送项目编号"); - } - - XmProduct xmProduct=this.xmProductService.getProductFromCache(xmProjectPhase.getProductId()); - List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProductId()); - User user = LoginUtils.getCurrentUserInfo(); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许修改计划预算"); - m.put("tips", tips); - return m; - } - String productId=null; - for (XmPhase g : xmProjectPhases) { - productId=g.getProductId(); - g= xmPhaseService.autoCalcWorkload(g); - xmPhaseService.calcPhaseBudgetAmount(g); - } - xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases); - List l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList()); - if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 - BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; - BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; - for (XmPhase l1Phase : l1Phases) { - phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getBudgetWorkload()); - phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getBudgetAt()); - } - if("1".equals(xmProduct.getBudgetCtrl())){ - tips= xmPhaseService.judgetProductBudget(productId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList())); - if(!tips.isOk()){ - return ResponseHelper.failed(tips); - } - } - } - //找到导入的树中最上面的节点 - List parentNoNulls= xmProjectPhases.stream().filter(i->StringUtils.hasText(i.getParentId())&&!"0".equals(i.getParentId())).collect(Collectors.toList()); - //根据同一个父亲归类 - Map> map=new HashMap<>(); - for (XmPhase phase : parentNoNulls) { - List phases=map.get(phase.getParentId()); - if(phases==null){ - phases=new ArrayList<>(); - map.put(phase.getParentId(),phases); - } - phases.add(phase); - } - 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 (XmPhase child : children) { - phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getBudgetAt()); - } - if("1".equals(xmProduct.getPhaseBudgetCtrl())) { - Tips tips2 = xmPhaseService.judgetPhaseBudget(parentId, phaseTotalBudgetAt, null, null, null, excludeIds); - if (!tips2.isOk()) { - tips2.setFailureMsg(tips2.getMsg() + " 相关计划为【" + children.stream().map(i -> i.getName()).collect(Collectors.joining(",")) + "】"); - return ResponseHelper.failed(tips2); - } - } - } - - - for (XmPhase projectPhase : xmProjectPhases) { - int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentId())).count()+""); - if(childrenCnt>0){ - projectPhase.setChildrenCnt(childrenCnt); - projectPhase.setNtype("1"); - } - } - List xmProjectPhaseListDb= xmPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList())); - - List inserts=xmProjectPhases.stream().filter(i->!xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList()); - List updates=xmProjectPhases.stream().filter(i->xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList()); - xmPhaseService.batchInsertOrUpdate(inserts,updates); - for (XmPhase phase : xmProjectPhases) { - xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-修改计划预算", "修改计划"+phase.getName(),JSON.toJSONString(phase),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="loaMenusToXmProductPhase") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @HasQx(value = "xm_core_xmPhase_loadTasksToXmProjectPhase",name = "计算各个计划对应的bug、task、测试案例等数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/loaMenusToXmProductPhase",method=RequestMethod.POST) - public Map loadTasksToXmProjectPhase(@RequestBody Map params) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功修改数据"); - try{ - String productId=(String) params.get("productId"); - - if(!StringUtils.hasText(productId)){ - return ResponseHelper.failed("productId-0","请上送项目编号"); - } - List groupVoList=groupService.getProjectGroupVoList(productId); - User user = LoginUtils.getCurrentUserInfo(); - - XmProduct xmProduct=this.xmProductService.getProductFromCache(productId); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许发起计划统计任务"); - m.put("tips", tips); - return m; - } - int i= xmPhaseService.loaMenusToXmProductPhase(xmProduct.getId()); - xmRecordService.addProductPhaseRecord(xmProduct.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 = "关键路径计算",notes="calcKeyPaths") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @HasQx(value = "xm_core_xmPhase_calcKeyPaths",name = "关键路径计算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/calcKeyPaths",method=RequestMethod.POST) - public Map calcKeyPaths(@RequestBody Map params) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功修改数据"); - try{ - String productId=(String) params.get("productId"); - - if(!StringUtils.hasText(productId)){ - return ResponseHelper.failed("productId-0","请上送项目编号"); - } - List groupVoList=groupService.getProjectGroupVoList(productId); - User user = LoginUtils.getCurrentUserInfo(); - - XmProduct xmProduct=this.xmProductService.getProductFromCache(productId); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许发起关键路径计算任务"); - m.put("tips", tips); - return m; - } - xmPhaseService.calcKeyPaths((String) params.get("productId")); - xmRecordService.addProductPhaseRecord(xmProduct.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 = "查询产品与计划汇总数据",notes="selectTotalProductAndPhaseBudgetCost") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @HasQx(value = "xm_core_xmPhase_selectTotalProductAndPhaseBudgetCost",name = "查询产品与计划汇总数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/selectTotalProductAndPhaseBudgetCost",method=RequestMethod.POST) - public Map getProjectBudgetWithsPhaseBudget(@RequestBody Map params) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功查询预算数据"); - try{ - String productId=(String) params.get("productId"); - if(!StringUtils.hasText(productId)){ - return ResponseHelper.failed("productId-0","请上送项目编号"); - } - List groupVoList=groupService.getProjectGroupVoList(productId); - User user = LoginUtils.getCurrentUserInfo(); - - XmProduct xmProduct=this.xmProductService.getProductFromCache(productId); - boolean meIsPm=groupService.checkUserIsProductAdm(xmProduct,user.getUserid()); - boolean meIsTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,user.getUserid(),user.getUserid()); - if( !meIsPm && !meIsTeamHead ){ - tips.setFailureMsg("您不是组长、也不是产品管理者，不允许查询产品与计划汇总数据"); - m.put("tips", tips); - return m; - } - Map data= xmPhaseService.selectTotalProjectAndPhaseBudgetCost((String) params.get("productId"),null); - m.put("data",data); - }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; - } - -} diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java deleted file mode 100644 index b2c459e9..00000000 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.xm.core.ctrl; - -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; -import com.mdp.core.utils.ResponseHelper; -import com.xm.core.entity.XmMenu; -import com.xm.core.service.XmGroupService; -import com.xm.core.service.XmMenuService; -import com.xm.core.service.XmProductService; -import com.xm.core.service.XmRecordService; -import com.xm.core.service.push.XmMenuPushMsgService; -import com.xm.core.vo.XmPhaseMenusVo; -import io.swagger.annotations.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * url编制采用rest风格,如对XM.xm_iteration_menu 计划定义的操作有增删改查,对应的url分别为:
- * 新增: xm/xmPhaseMenu/add
- * 查询: xm/xmPhaseMenu/list
- * 模糊查询: xm/xmPhaseMenu/listKey
- * 修改: xm/xmPhaseMenu/edit
- * 删除: xm/xmPhaseMenu/del
- * 批量删除: xm/xmPhaseMenu/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmPhaseMenu 表 XM.xm_iteration_menu 当前主键(包括多主键): id; - ***/ -@RestController("xm.core.xmPhaseMenuController") -@RequestMapping(value="/**/xm/core/xmPhaseMenu") -@Api(tags={"计划定义操作接口"}) -public class XmPhaseMenuController { - - static Log logger=LogFactory.getLog(XmPhaseMenuController.class); - - - - @Autowired - XmMenuPushMsgService xmMenuPushMsgService; - - @Autowired - XmMenuService xmMenuService; - - @Autowired - XmMenuController xmMenuController; - - @Autowired - XmGroupService groupService; - - - @Autowired - XmProductService xmProductService; - - @Autowired - XmRecordService xmRecordService; - - @ApiOperation( value = "查询计划定义信息列表",notes="listXmPhaseMenu,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value="主键,主键",required=false), - @ApiImplicitParam(name="phaseId",value="对应的计划编号",required=false), - @ApiImplicitParam(name="menuId",value="需求编号",required=false), - @ApiImplicitParam(name="productId",value="产品编号",required=false), - @ApiImplicitParam(name="ctime",value="关联时间",required=false), - @ApiImplicitParam(name="relStatus",value="关联状态0不再关联1正常关联",required=false), - @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), - @ApiImplicitParam(name="pageNum",value="当前页码,从1开始",required=false), - @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), - @ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student_id desc",required=false), - @ApiImplicitParam(name="count",value="是否进行总条数计算,count=true|false",required=false) - }) - @ApiResponses({ - @ApiResponse(code = 200,response= Map.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") - }) - @RequestMapping(value="/list",method=RequestMethod.GET) - public Map listWithPhase( @ApiIgnore @RequestParam Map xmPhaseMenu){ - return xmMenuController.listWithPhase(xmPhaseMenu); - } - - - - @ApiOperation( value = "根据主键列表批量删除计划定义信息",notes="batchDelXmPhaseMenu,仅需要上传主键字段") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Map batchDelXmPhaseMenu(@RequestBody XmPhaseMenusVo xmPhaseMenus) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功将需求移出计划"); - try{ - List menuIds=xmPhaseMenus.getMenuIds(); - if(menuIds==null || menuIds.size()==0){ - return ResponseHelper.failed("menuIds-0","需求编号不能为空"); - } - List menus=xmMenuService.selectListByIds(menuIds); - if(menus==null || menus.size()==0){ - return ResponseHelper.failed("menus-0","需求已不存在"); - } - - - - List noQxOpList=new ArrayList<>(); - List canOpList=new ArrayList<>(); - groupService.calcCanOpMenus(menus,canOpList,noQxOpList); - /** - if(menus.stream().filter(i->!productId.equals(i.getProductId())).findAny().isPresent()){ - return ResponseHelper.failed("productId-0","批量操作的需求必须是同一个产品下的需求。"); - } - **/ - List notJoins=new ArrayList<>(); - List status7=new ArrayList<>(); - List canDels=new ArrayList<>(); - for (XmMenu menu : canOpList) { - if(!StringUtils.hasText(menu.getPhaseId())){ - notJoins.add(menu); - continue; - } - if("7".equals(menu.getStatus())){ - status7.add(menu); - continue; - } - canDels.add(menu); - } - List msgs=new ArrayList<>(); - msgs.add("成功将"+canDels.size()+"个需求移出计划"); - if(canDels.size()>0){ - xmPhaseMenus.setMenuIds(canDels.stream().map(i->i.getMenuId()).collect(Collectors.toList())); - xmMenuService.batchUnProductPhase(xmPhaseMenus); - xmRecordService.addXmMenuRecord( canDels,"产品-计划-批量将需求移出","将需求移出计划"); - //this.xmMenuPushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmPhaseMenu.getMenuId(), user.getUserid(), user.getUsername(), user.getUsername()+"将需求【"+xmPhaseMenu.getMenuId()+"】加入计划"); - } - if(noQxOpList.size()>0){ - msgs.add("有"+noQxOpList.size()+"个需求无权限操作，【"+noQxOpList.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(status7.size()>0){ - msgs.add("有"+status7.size()+"个需求状态为已上线,不能移出计划，【"+status7.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(notJoins.size()>0){ - msgs.add("有"+notJoins.size()+"个需求未加入计划，无需移出，【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(canDels.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); - }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); - } - }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; - } - @RequestMapping(value="/batchAdd",method=RequestMethod.POST) - public Map batchAddXmPhaseMenu(@RequestBody XmPhaseMenusVo xmPhaseMenus) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功将需求与计划关联"); - try{ - if(!StringUtils.hasText(xmPhaseMenus.getPhaseId())){ - return ResponseHelper.failed("phaseId-0","计划编号不能为空"); - } - List menuIds=xmPhaseMenus.getMenuIds(); - if(menuIds==null || menuIds.size()==0){ - return ResponseHelper.failed("menuIds-0","需求编号不能为空"); - } - List menus=xmMenuService.selectListByIds(menuIds); - if(menus==null || menus.size()==0){ - return ResponseHelper.failed("menus-0","需求已不存在"); - } - - List noQxOpList=new ArrayList<>(); - List canOpList=new ArrayList<>(); - groupService.calcCanOpMenus(menus,canOpList,noQxOpList); - List hadJoin=new ArrayList<>(); - List ntype1=new ArrayList<>(); - List status789=new ArrayList<>(); - List canAdds=new ArrayList<>(); - for (XmMenu menu : canOpList) { - if(StringUtils.hasText(menu.getPhaseId())){ - hadJoin.add(menu); - continue; - } - if("1".equals(menu.getNtype())){ - ntype1.add(menu); - continue; - } - if("7".equals(menu.getStatus())||"8".equals(menu.getStatus())||"9".equals(menu.getStatus())){ - status789.add(menu); - continue; - } - canAdds.add(menu); - } - List msgs=new ArrayList<>(); - msgs.add("成功将"+canAdds.size()+"个需求加入计划"); - if(canAdds.size()>0){ - - xmPhaseMenus.setMenuIds(canAdds.stream().map(i->i.getMenuId()).collect(Collectors.toList())); - xmMenuService.batchProductPhase(xmPhaseMenus); - xmRecordService.addXmMenuRecord( canAdds,"产品-计划-批量将需求加入计划","将需求加入计划"); - - //this.xmMenuPushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmPhaseMenu.getMenuId(), user.getUserid(), user.getUsername(), user.getUsername()+"将需求【"+xmPhaseMenu.getMenuId()+"】加入计划"); - } - - if(noQxOpList.size()>0){ - msgs.add("有"+noQxOpList.size()+"个需求无权限操作，【"+noQxOpList.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(status789.size()>0){ - msgs.add("有"+status789.size()+"个需求状态为已上线、已下线、已删除状态，不能加入计划。【"+status789.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(hadJoin.size()>0){ - msgs.add("有"+hadJoin.size()+"个需求已加入计划，不能重复加入。【"+hadJoin.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(ntype1.size()>0){ - msgs.add("有"+ntype1.size()+"个需求为需求池，不用加入计划。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); - } - if(canAdds.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); - }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); - } - - }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; - } -} diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index c6b8130d..6e507ab8 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -287,7 +287,7 @@ public class XmTaskExecuserController { List noAllowUsers=new ArrayList<>(); List allowUsers=new ArrayList<>(); List allowUserNames=new ArrayList<>(); - boolean isPm=groupService.checkUserIsPmOrAssByPtype(user.getUserid(),xmTask.getPtype(),xmTask.getProjectId(),xmTask.getProductId()); + boolean isPm=groupService.checkUserIsProjectAdm(xmTask.getProjectId(),user.getUserid()); for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserListDb) { if(!taskId.equals(xmTaskExecuser.getTaskId())){ @@ -299,7 +299,7 @@ public class XmTaskExecuserController { allowUsers.add(xmTaskExecuser); allowUserNames.add(xmTaskExecuser.getUsername()); }else{ - Tips tips2=groupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskExecuser.getUserid(),xmTask.getPtype(),xmTask.getProductId(),xmTask.getProjectId()); + Tips tips2=groupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskExecuser.getUserid(),xmTask.getProjectId()); if(tips2.isOk()==false){ noAllowUsers.add(xmTaskExecuser.getUsername()); continue; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index 9e133a2d..08a4f034 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -234,9 +234,9 @@ public class XmTaskWorkloadController { } if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ - Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getCreateUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId()); + Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId()); if(!isCreate.isOk()){ - Tips isExec=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId()); + Tips isExec=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); if(!isExec.isOk()){ return failed("noqx-0","你无权针对该业务进行报工"); } @@ -299,9 +299,9 @@ public class XmTaskWorkloadController { } User user= LoginUtils.getCurrentUserInfo(); if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ - Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getCreateUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId()); + Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId()); if(!isCreate.isOk()){ - Tips isExec=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId()); + Tips isExec=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); if(!isExec.isOk()){ return failed("noqx-0","你无权针对该业务进行报工"); } @@ -352,9 +352,9 @@ public class XmTaskWorkloadController { Set xmMenuIds=new HashSet<>(); for (XmTask xmTaskDb : tasksDb) { if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ - Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getCreateUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId()); + Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId()); if(!isCreate.isOk()){ - Tips isExec=xmGroupService.checkIsAdmOrTeamHeadOrAssByPtype(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId()); + Tips isExec=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); if(!isExec.isOk()){ break; } diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java index 2dbb4676..d0e21f56 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java @@ -57,6 +57,7 @@ public class XmRecordService extends BaseService { record.setObjType("product"); record.setNewValue(newValue); record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } @@ -74,6 +75,7 @@ public class XmRecordService extends BaseService { record.setBizId(productId); record.setRemarks(remarks); record.setObjType("product"); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } /** @@ -94,6 +96,7 @@ public class XmRecordService extends BaseService { record.setObjType("project"); record.setNewValue(newValue); record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } @@ -110,7 +113,8 @@ public class XmRecordService extends BaseService { record.setAction(action); record.setRemarks(remarks); record.setBizId(projectId); - record.setObjType("project"); + record.setObjType("project"); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } @@ -159,9 +163,54 @@ public class XmRecordService extends BaseService { record.setBizId(taskId); record.setAction(action); record.setRemarks(remarks); - record.setObjType("task"); + record.setObjType("task"); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } + + + /** + * 针对项目下的任务的所有操作用此方法 + * @param projectId 项目编号 + * @param budgetId 预算编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + */ + @Async + public void addXmBudgetRecord(String projectId,String budgetId,String action,String remarks) { + XmRecord record=this.initXmRecord(); + record.setProjectId(projectId); + record.setBizId(budgetId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("budget"); + record.setGloNo(MDC.get("gloNo")); + this.insert(record); + } + + /** + * 针对项目下的任务的所有操作用此方法 + * @param projectId 项目编号 + * @param budgetId 预算编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + * @param newValue 需要记录下来的新数据 可空 + * @param oldValue 需要记录下来的旧数据 可空 + */ + @Async + public void addXmBudgetRecord(String projectId,String budgetId,String action,String remarks,String newValue,String oldValue) { + XmRecord record=this.initXmRecord(); + record.setProjectId(projectId); + record.setBizId(budgetId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("budget"); + record.setNewValue(newValue); + record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); + this.insert(record); + } + /** * 针对项目下的任务的所有操作用此方法 * @param projectId 项目编号 @@ -181,6 +230,7 @@ public class XmRecordService extends BaseService { record.setObjType("task"); record.setNewValue(newValue); record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } @@ -199,6 +249,7 @@ public class XmRecordService extends BaseService { record.setAction(action); record.setRemarks(remarks); record.setObjType("menu"); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } /** @@ -253,6 +304,7 @@ public class XmRecordService extends BaseService { record.setObjType("task"); record.setNewValue(newValue); record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } /** @@ -268,6 +320,7 @@ public class XmRecordService extends BaseService { record.setObjType("iteration"); record.setAction(action); record.setRemarks(remarks); + record.setGloNo(MDC.get("gloNo")); super.insert(record); } @@ -287,6 +340,7 @@ public class XmRecordService extends BaseService { record.setRemarks(remarks); record.setNewValue(newValue); record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); super.insert(record); } @@ -305,7 +359,8 @@ public class XmRecordService extends BaseService { record.setBizId(groupId); record.setAction(action); record.setRemarks(remarks); - record.setObjType("group"); + record.setObjType("group"); + record.setGloNo(MDC.get("gloNo")); this.insert(record); } @@ -328,6 +383,51 @@ public class XmRecordService extends BaseService { record.setObjType("group"); record.setNewValue(newValue); record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); + this.insert(record); + } + + + + /** + * 针对项目下的任务的所有操作用此方法 + * @param projectId 项目编号 + * @param costId 成本编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + */ + @Async + public void addXmCostRecord(String projectId,String costId,String action,String remarks) { + XmRecord record=this.initXmRecord(); + record.setProjectId(projectId); + record.setBizId(costId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("cost"); + record.setGloNo(MDC.get("gloNo")); + this.insert(record); + } + + /** + * 针对项目下的任务的所有操作用此方法 + * @param projectId 项目编号 + * @param costId 成本编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + * @param newValue 需要记录下来的新数据 可空 + * @param oldValue 需要记录下来的旧数据 可空 + */ + @Async + public void addXmCostRecord(String projectId,String costId,String action,String remarks,String newValue,String oldValue) { + XmRecord record=this.initXmRecord(); + record.setProjectId(projectId); + record.setBizId(costId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("cost"); + record.setNewValue(newValue); + record.setOldValue(oldValue); + record.setGloNo(MDC.get("gloNo")); this.insert(record); }