end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
bd76027f26
commit
f070e6d593
10 changed files with 243 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 178
      xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
  2. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
  3. 178
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  4. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  5. 6
      xm-core/src/main/java/com/xm/core/entity/XmPhase.java
  6. 76
      xm-core/src/main/java/com/xm/core/service/XmPhaseService.java
  7. 10
      xm-core/src/main/java/com/xm/core/service/XmProductService.java
  8. 10
      xm-core/src/main/java/com/xm/core/service/XmProjectService.java
  9. 4
      xm-core/src/main/java/com/xm/core/vo/XmPhaseVo.java
  10. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml

178
xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
View File

@ -11,8 +11,8 @@ import com.mdp.qx.HasQx;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.PubTool; import com.xm.core.PubTool;
import com.xm.core.entity.XmPhase;
import com.xm.core.entity.XmProduct; import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmProjectPhase;
import com.xm.core.service.*; import com.xm.core.service.*;
import com.xm.core.vo.XmGroupVo; import com.xm.core.vo.XmGroupVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
@ -47,7 +47,7 @@ public class XmProductPhaseController {
static Log logger=LogFactory.getLog(XmProductPhaseController.class); static Log logger=LogFactory.getLog(XmProductPhaseController.class);
@Autowired @Autowired
private XmProjectPhaseService xmProjectPhaseService;
private XmPhaseService xmPhaseService;
@Autowired @Autowired
private XmGroupService groupService; private XmGroupService groupService;
@ -106,14 +106,14 @@ public class XmProductPhaseController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
}) })
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response= XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
}) })
@RequestMapping(value="/list",method=RequestMethod.GET) @RequestMapping(value="/list",method=RequestMethod.GET)
public Map<String,Object> listXmProductPhase( @RequestParam Map<String,Object> xmProjectPhase){ public Map<String,Object> listXmProductPhase( @RequestParam Map<String,Object> xmProjectPhase){
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmProjectPhase, "ids"); RequestUtils.transformArray(xmProjectPhase, "ids");
PageUtils.startPage(xmProjectPhase); PageUtils.startPage(xmProjectPhase);
List<Map<String,Object>> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表
List<Map<String,Object>> xmProjectPhaseList = xmPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表
PageUtils.responePage(m, xmProjectPhaseList); PageUtils.responePage(m, xmProjectPhaseList);
if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){ if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
@ -129,7 +129,7 @@ public class XmProductPhaseController {
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);
} }
if(pidPathsSet!=null && pidPathsSet.size()>0){ if(pidPathsSet!=null && pidPathsSet.size()>0){
List<Map<String,Object>> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
List<Map<String,Object>> parentList= xmPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());
if(parentList!=null && parentList.size()>0){ if(parentList!=null && parentList.size()>0){
xmProjectPhaseList.addAll(parentList); xmProjectPhaseList.addAll(parentList);
@ -146,7 +146,7 @@ public class XmProductPhaseController {
@HasQx(value = "xm_core_xmProjectPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/setPhaseMngUser",method=RequestMethod.POST) @RequestMapping(value="/setPhaseMngUser",method=RequestMethod.POST)
public Map<String,Object> setPhaseMngUser(@RequestBody XmProjectPhase xmProjectPhase) {
public Map<String,Object> setPhaseMngUser(@RequestBody XmPhase xmProjectPhase) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功设置"); Tips tips=new Tips("成功设置");
try{ try{
@ -155,8 +155,8 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
}else{ }else{
XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId());
XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhaseQuery);
XmPhase xmProjectPhaseQuery = new XmPhase(xmProjectPhase.getId());
XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhaseQuery);
if(xmProjectPhaseDb==null){ if(xmProjectPhaseDb==null){
tips.setFailureMsg("计划不存在"); tips.setFailureMsg("计划不存在");
m.put("tips", tips); m.put("tips", tips);
@ -179,11 +179,11 @@ public class XmProductPhaseController {
return m; return m;
} }
if(tips.isOk()){ if(tips.isOk()){
XmProjectPhase xmProjectPhaseToUpdate=new XmProjectPhase();
XmPhase xmProjectPhaseToUpdate=new XmPhase();
xmProjectPhaseToUpdate.setId(xmProjectPhase.getId()); xmProjectPhaseToUpdate.setId(xmProjectPhase.getId());
xmProjectPhaseToUpdate.setMngUserid(xmProjectPhase.getMngUserid()); xmProjectPhaseToUpdate.setMngUserid(xmProjectPhase.getMngUserid());
xmProjectPhaseToUpdate.setMngUsername(xmProjectPhase.getMngUsername()); xmProjectPhaseToUpdate.setMngUsername(xmProjectPhase.getMngUsername());
this.xmProjectPhaseService.updateSomeFieldByPk(xmProjectPhaseToUpdate);
this.xmPhaseService.updateSomeFieldByPk(xmProjectPhaseToUpdate);
this.xmRecordService.addProductPhaseRecord(xmProduct.getId(),xmProjectPhase.getId(),"产品-计划-设置计划负责人","计划负责人由【"+xmProjectPhaseDb.getMngUsername()+"】变更为【"+xmProjectPhase.getMngUsername()+"】"); this.xmRecordService.addProductPhaseRecord(xmProduct.getId(),xmProjectPhase.getId(),"产品-计划-设置计划负责人","计划负责人由【"+xmProjectPhaseDb.getMngUsername()+"】变更为【"+xmProjectPhase.getMngUsername()+"】");
} }
} }
@ -201,11 +201,11 @@ public class XmProductPhaseController {
@ApiOperation( value = "新增一条xm_project_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成") @ApiOperation( value = "新增一条xm_project_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成")
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response=XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
}) })
@HasQx(value = "xm_core_xmProjectPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/add",method=RequestMethod.POST) @RequestMapping(value="/add",method=RequestMethod.POST)
public Map<String,Object> addXmProjectPhase(@RequestBody XmProjectPhase xmProjectPhase) {
public Map<String,Object> addXmProjectPhase(@RequestBody XmPhase xmProjectPhase) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功新增一条数据"); Tips tips=new Tips("成功新增一条数据");
try{ try{
@ -213,10 +213,10 @@ public class XmProductPhaseController {
return ResponseHelper.failed("productId-0","请上送项目编号"); return ResponseHelper.failed("productId-0","请上送项目编号");
} }
if(StringUtils.isEmpty(xmProjectPhase.getId())) { if(StringUtils.isEmpty(xmProjectPhase.getId())) {
xmProjectPhase.setId(xmProjectPhaseService.createKey("id"));
xmProjectPhase.setId(xmPhaseService.createKey("id"));
}else{ }else{
XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId());
if(xmProjectPhaseService.countByWhere(xmProjectPhaseQuery)>0){
XmPhase xmProjectPhaseQuery = new XmPhase(xmProjectPhase.getId());
if(xmPhaseService.countByWhere(xmProjectPhaseQuery)>0){
tips.setFailureMsg("编号重复，请修改编号再提交"); tips.setFailureMsg("编号重复，请修改编号再提交");
m.put("tips", tips); m.put("tips", tips);
return m; return m;
@ -245,28 +245,28 @@ public class XmProductPhaseController {
} }
List<String> excludePhaseIds=new ArrayList<>(); List<String> excludePhaseIds=new ArrayList<>();
excludePhaseIds.add(xmProjectPhase.getId()); excludePhaseIds.add(xmProjectPhase.getId());
xmProjectPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase);
xmPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase);
if(xmProjectPhase.getLvl()==1){ if(xmProjectPhase.getLvl()==1){
if("1".equals(xmProduct.getBudgetCtrl())){ if("1".equals(xmProduct.getBudgetCtrl())){
tips=xmProjectPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
tips= xmPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
} }
}else { }else {
if("1".equals(xmProduct.getPhaseBudgetCtrl())) { if("1".equals(xmProduct.getPhaseBudgetCtrl())) {
tips = xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
tips = xmPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
} }
} }
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
XmProjectPhase parentDb=xmProjectPhaseService.selectOneObject(new XmProjectPhase(xmProjectPhase.getParentPhaseId()));
XmPhase parentDb= xmPhaseService.selectOneObject(new XmPhase(xmProjectPhase.getParentPhaseId()));
if(parentDb==null){ if(parentDb==null){
return ResponseHelper.failed("p-no-exists","上级计划不存在"); return ResponseHelper.failed("p-no-exists","上级计划不存在");
} }
if(!"1".equals(parentDb.getNtype())){ if(!"1".equals(parentDb.getNtype())){
return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划"); return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划");
} }
xmProjectPhaseService.insert(xmProjectPhase);
xmPhaseService.insert(xmProjectPhase);
xmRecordService.addProductPhaseRecord(xmProduct.getId(), xmProjectPhase.getId(), "产品-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); xmRecordService.addProductPhaseRecord(xmProduct.getId(), xmProjectPhase.getId(), "产品-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
m.put("data",xmProjectPhase); m.put("data",xmProjectPhase);
}catch (BizException e) { }catch (BizException e) {
@ -286,14 +286,14 @@ public class XmProductPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/del",method=RequestMethod.POST) @RequestMapping(value="/del",method=RequestMethod.POST)
public Map<String,Object> delXmProjectPhase(@RequestBody XmProjectPhase xmProjectPhase){
public Map<String,Object> delXmProjectPhase(@RequestBody XmPhase xmProjectPhase){
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除一条数据"); Tips tips=new Tips("成功删除一条数据");
try{ try{
if(!StringUtils.hasText(xmProjectPhase.getId())){ if(!StringUtils.hasText(xmProjectPhase.getId())){
return ResponseHelper.failed("id-0","请上送计划编号"); return ResponseHelper.failed("id-0","请上送计划编号");
} }
XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhase);
XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhase);
if(xmProjectPhaseDb==null){ if(xmProjectPhaseDb==null){
return ResponseHelper.failed("data-0","该计划已不存在"); return ResponseHelper.failed("data-0","该计划已不存在");
} }
@ -314,7 +314,7 @@ public class XmProductPhaseController {
return m; return m;
} }
//检查是否由关联的任务，有则不允许删除 //检查是否由关联的任务，有则不允许删除
Long exists=this.xmProjectPhaseService.checkExistsTask(xmProjectPhase.getId());
Long exists=this.xmPhaseService.checkExistsTask(xmProjectPhase.getId());
if(exists>0) { if(exists>0) {
tips.setFailureMsg("存在"+exists+"条任务,不允许删除"); tips.setFailureMsg("存在"+exists+"条任务,不允许删除");
}else { }else {
@ -322,7 +322,7 @@ public class XmProductPhaseController {
if(xmProjectPhaseDb.getChildrenCnt()!=null && xmProjectPhaseDb.getChildrenCnt()>0){ if(xmProjectPhaseDb.getChildrenCnt()!=null && xmProjectPhaseDb.getChildrenCnt()>0){
tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除"); tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除");
} else { } else {
xmProjectPhaseService.deleteByPk(xmProjectPhaseDb);
xmPhaseService.deleteByPk(xmProjectPhaseDb);
xmRecordService.addProductPhaseRecord(xmProjectPhaseDb.getProductId(), xmProjectPhaseDb.getId(), "产品-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),"",JSON.toJSONString(xmProjectPhaseDb)); xmRecordService.addProductPhaseRecord(xmProjectPhaseDb.getProductId(), xmProjectPhaseDb.getId(), "产品-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),"",JSON.toJSONString(xmProjectPhaseDb));
} }
} }
@ -343,18 +343,18 @@ public class XmProductPhaseController {
/***/ /***/
@ApiOperation( value = "根据主键修改一条xm_project_phase信息",notes="editXmProjectPhase") @ApiOperation( value = "根据主键修改一条xm_project_phase信息",notes="editXmProjectPhase")
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response=XmProjectPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
}) })
@HasQx(value = "xm_core_xmProjectPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/edit",method=RequestMethod.POST) @RequestMapping(value="/edit",method=RequestMethod.POST)
public Map<String,Object> editXmProjectPhase(@RequestBody XmProjectPhase xmProjectPhase) {
public Map<String,Object> editXmProjectPhase(@RequestBody XmPhase xmProjectPhase) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功更新一条数据"); Tips tips=new Tips("成功更新一条数据");
try{ try{
if(!StringUtils.hasText(xmProjectPhase.getId())){ if(!StringUtils.hasText(xmProjectPhase.getId())){
return ResponseHelper.failed("id-0","请上送计划编号"); return ResponseHelper.failed("id-0","请上送计划编号");
} }
XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhase);
XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhase);
if(xmProjectPhaseDb==null){ if(xmProjectPhaseDb==null){
return ResponseHelper.failed("data-0","该计划已不存在"); return ResponseHelper.failed("data-0","该计划已不存在");
} }
@ -378,8 +378,8 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase);
xmProjectPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
xmProjectPhase= xmPhaseService.autoCalcWorkload(xmProjectPhase);
xmPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
List<String> excludePhaseIds=new ArrayList<>(); List<String> excludePhaseIds=new ArrayList<>();
excludePhaseIds.add(xmProjectPhase.getId()); excludePhaseIds.add(xmProjectPhase.getId());
@ -387,11 +387,11 @@ public class XmProductPhaseController {
if(xmProjectPhaseDb.getPhaseBudgetAt()!=null && xmProjectPhaseDb.getPhaseBudgetAt().compareTo(xmProjectPhase.getPhaseBudgetAt())!=0){ if(xmProjectPhaseDb.getPhaseBudgetAt()!=null && xmProjectPhaseDb.getPhaseBudgetAt().compareTo(xmProjectPhase.getPhaseBudgetAt())!=0){
if(xmProjectPhase.getLvl()==1){ if(xmProjectPhase.getLvl()==1){
if("1".equals(xmProduct.getBudgetCtrl())){ if("1".equals(xmProduct.getBudgetCtrl())){
tips=this.xmProjectPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
tips=this.xmPhaseService.judgetProductBudget(xmProduct.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
} }
}else{ }else{
if("1".equals(xmProduct.getPhaseBudgetCtrl())) { if("1".equals(xmProduct.getPhaseBudgetCtrl())) {
tips = this.xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
tips = this.xmPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
} }
} }
@ -399,7 +399,7 @@ public class XmProductPhaseController {
if(!tips.isOk()) { if(!tips.isOk()) {
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
xmProjectPhaseService.editByPk(xmProjectPhase);
xmPhaseService.editByPk(xmProjectPhase);
xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), xmProjectPhase.getId(), "产品-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), xmProjectPhase.getId(), "产品-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
m.put("data",xmProjectPhase); m.put("data",xmProjectPhase);
@ -423,7 +423,7 @@ public class XmProductPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchDel",method=RequestMethod.POST) @RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map<String,Object> batchDelXmProjectPhase(@RequestBody List<XmProjectPhase> xmProjectPhases) {
public Map<String,Object> batchDelXmProjectPhase(@RequestBody List<XmPhase> xmProjectPhases) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除"+(xmProjectPhases==null?0:xmProjectPhases.size())+"条数据"); Tips tips=new Tips("成功删除"+(xmProjectPhases==null?0:xmProjectPhases.size())+"条数据");
try{ try{
@ -432,7 +432,7 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
XmProjectPhase xmProjectPhase=xmProjectPhases.get(0);
XmPhase xmProjectPhase=xmProjectPhases.get(0);
if(!StringUtils.hasText(xmProjectPhase.getProductId())){ if(!StringUtils.hasText(xmProjectPhase.getProductId())){
tips.setFailureMsg("项目编号不能为空"); tips.setFailureMsg("项目编号不能为空");
m.put("tips", tips); m.put("tips", tips);
@ -451,26 +451,26 @@ public class XmProductPhaseController {
return m; return m;
} }
List<String> noQxUsernames=new ArrayList<>(); List<String> noQxUsernames=new ArrayList<>();
List<XmProjectPhase> delPhases=new ArrayList<>();
List<XmProjectPhase> xmProjectPhaseListDb=this.xmProjectPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList()));
for (XmProjectPhase phase : xmProjectPhaseListDb) {
List<XmPhase> delPhases=new ArrayList<>();
List<XmPhase> 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()); boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,phase.getMngUserid(),user.getUserid());
if( !meIsPm && !meIsHisTeamHead ){ if( !meIsPm && !meIsHisTeamHead ){
noQxUsernames.add(phase.getMngUsername()); noQxUsernames.add(phase.getMngUsername());
continue; continue;
} }
//检查是否由关联的任务，有则不允许删除 //检查是否由关联的任务，有则不允许删除
Long exists=this.xmProjectPhaseService.checkExistsTask(phase.getId());
Long exists=this.xmPhaseService.checkExistsTask(phase.getId());
if(exists>0) { if(exists>0) {
existsTaskList.add(phase.getPhaseName()); existsTaskList.add(phase.getPhaseName());
}else { }else {
delPhases.add(phase); delPhases.add(phase);
} }
} }
List<XmProjectPhase> canDelNodes=new ArrayList<>();
for (XmProjectPhase phase : delPhases) {
List<XmPhase> canDelNodes=new ArrayList<>();
for (XmPhase phase : delPhases) {
boolean canDelAllChild =xmProjectPhaseService.checkCanDelAllChild(phase,delPhases);
boolean canDelAllChild = xmPhaseService.checkCanDelAllChild(phase,delPhases);
if(!canDelAllChild) { if(!canDelAllChild) {
hasChildList.add(phase.getPhaseName()); hasChildList.add(phase.getPhaseName());
}else { }else {
@ -478,7 +478,7 @@ public class XmProductPhaseController {
} }
} }
if(canDelNodes.size()>0){ if(canDelNodes.size()>0){
this.xmProjectPhaseService.doBatchDelete(canDelNodes);
this.xmPhaseService.doBatchDelete(canDelNodes);
xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), "", "产品-计划-批量删除计划", "批量删除计划"+canDelNodes.stream().map(i->i.getPhaseName()).collect(Collectors.joining(",")),"",JSON.toJSONString(canDelNodes)); xmRecordService.addProductPhaseRecord(xmProjectPhase.getProductId(), "", "产品-计划-批量删除计划", "批量删除计划"+canDelNodes.stream().map(i->i.getPhaseName()).collect(Collectors.joining(",")),"",JSON.toJSONString(canDelNodes));
} }
@ -519,7 +519,7 @@ public class XmProductPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST) @RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST)
public Map<String,Object> batchImportFromTemplate(@RequestBody List<XmProjectPhase> xmProjectPhases) {
public Map<String,Object> batchImportFromTemplate(@RequestBody List<XmPhase> xmProjectPhases) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功导入"+xmProjectPhases.size()+"条数据"); Tips tips=new Tips("成功导入"+xmProjectPhases.size()+"条数据");
try{ try{
@ -528,7 +528,7 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
XmProjectPhase xmProjectPhase=xmProjectPhases.get(0);
XmPhase xmProjectPhase=xmProjectPhases.get(0);
if(!StringUtils.hasText(xmProjectPhase.getProductId())){ if(!StringUtils.hasText(xmProjectPhase.getProductId())){
return ResponseHelper.failed("productId-0","请上送项目编号"); return ResponseHelper.failed("productId-0","请上送项目编号");
@ -544,39 +544,39 @@ public class XmProductPhaseController {
return m; return m;
} }
String productId=null; String productId=null;
for (XmProjectPhase g : xmProjectPhases) {
for (XmPhase g : xmProjectPhases) {
productId=g.getProductId(); productId=g.getProductId();
g.setMngUserid(user.getUserid()); g.setMngUserid(user.getUserid());
g.setMngUsername(user.getUsername()); g.setMngUsername(user.getUsername());
g=xmProjectPhaseService.autoCalcWorkload(g);
xmProjectPhaseService.calcPhaseBudgetAmount(g);
g= xmPhaseService.autoCalcWorkload(g);
xmPhaseService.calcPhaseBudgetAmount(g);
} }
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmProjectPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下， if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，
//找到导入的树中最上面的节点 //找到导入的树中最上面的节点
List<XmProjectPhase> noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList());
List<XmPhase> noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList());
//根据同一个父亲归类 //根据同一个父亲归类
Map<String,List<XmProjectPhase>> map=new HashMap<>();
for (XmProjectPhase noExist : noExists) {
List<XmProjectPhase> phases=map.get(noExist.getParentPhaseId());
Map<String,List<XmPhase>> map=new HashMap<>();
for (XmPhase noExist : noExists) {
List<XmPhase> phases=map.get(noExist.getParentPhaseId());
if(phases==null){ if(phases==null){
phases=new ArrayList<>(); phases=new ArrayList<>();
map.put(noExist.getParentPhaseId(),phases); map.put(noExist.getParentPhaseId(),phases);
} }
phases.add(noExist); phases.add(noExist);
} }
for (Map.Entry<String, List<XmProjectPhase>> kv : map.entrySet()) {
for (Map.Entry<String, List<XmPhase>> kv : map.entrySet()) {
String parentId=kv.getKey(); String parentId=kv.getKey();
List<XmProjectPhase> children=kv.getValue();
List<XmPhase> children=kv.getValue();
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList());
for (XmProjectPhase child : children) {
for (XmPhase child : children) {
phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt());
} }
if("1".equals(xmProduct.getPhaseBudgetCtrl())){ if("1".equals(xmProduct.getPhaseBudgetCtrl())){
Tips tips2=xmProjectPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds);
Tips tips2= xmPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds);
if(!tips2.isOk()){ if(!tips2.isOk()){
tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】"); tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】");
return ResponseHelper.failed(tips2); return ResponseHelper.failed(tips2);
@ -586,27 +586,27 @@ public class XmProductPhaseController {
}else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 }else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算
BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO;
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
for (XmProjectPhase l1Phase : l1Phases) {
for (XmPhase l1Phase : l1Phases) {
phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload());
phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt());
} }
if("1".equals(xmProduct.getBudgetCtrl())) { if("1".equals(xmProduct.getBudgetCtrl())) {
tips = xmProjectPhaseService.judgetProductBudget(productId, phaseTotalBudgetAt, null, null, null, l1Phases.stream().map(i -> i.getId()).collect(Collectors.toList()));
tips = xmPhaseService.judgetProductBudget(productId, phaseTotalBudgetAt, null, null, null, l1Phases.stream().map(i -> i.getId()).collect(Collectors.toList()));
if (!tips.isOk()) { if (!tips.isOk()) {
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
} }
} }
if(tips.isOk()) { if(tips.isOk()) {
for (XmProjectPhase projectPhase : xmProjectPhases) {
for (XmPhase projectPhase : xmProjectPhases) {
projectPhase.setMngUsername(user.getUsername()); projectPhase.setMngUsername(user.getUsername());
projectPhase.setMngUserid(user.getUserid()); projectPhase.setMngUserid(user.getUserid());
projectPhase.setCtime(new Date()); projectPhase.setCtime(new Date());
projectPhase.setLtime(new Date()); projectPhase.setLtime(new Date());
} }
xmProjectPhaseService.doBatchInsert(xmProjectPhases);
xmPhaseService.doBatchInsert(xmProjectPhases);
for (XmProjectPhase phase : xmProjectPhases) {
for (XmPhase phase : xmProjectPhases) {
xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null);
} }
@ -629,7 +629,7 @@ public class XmProductPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST) @RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST)
public Map<String,Object> batchSaveBudget(@RequestBody List<XmProjectPhase> xmProjectPhases) {
public Map<String,Object> batchSaveBudget(@RequestBody List<XmPhase> xmProjectPhases) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功修改"+xmProjectPhases.size()+"条数据"); Tips tips=new Tips("成功修改"+xmProjectPhases.size()+"条数据");
try{ try{
@ -638,7 +638,7 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
XmProjectPhase xmProjectPhase=xmProjectPhases.get(0);
XmPhase xmProjectPhase=xmProjectPhases.get(0);
if(!StringUtils.hasText(xmProjectPhase.getProductId())){ if(!StringUtils.hasText(xmProjectPhase.getProductId())){
return ResponseHelper.failed("productId-0","请上送项目编号"); return ResponseHelper.failed("productId-0","请上送项目编号");
} }
@ -654,49 +654,49 @@ public class XmProductPhaseController {
return m; return m;
} }
String productId=null; String productId=null;
for (XmProjectPhase g : xmProjectPhases) {
for (XmPhase g : xmProjectPhases) {
productId=g.getProductId(); productId=g.getProductId();
g=xmProjectPhaseService.autoCalcWorkload(g);
xmProjectPhaseService.calcPhaseBudgetAmount(g);
g= xmPhaseService.autoCalcWorkload(g);
xmPhaseService.calcPhaseBudgetAmount(g);
} }
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmProjectPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算
BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO;
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
for (XmProjectPhase l1Phase : l1Phases) {
for (XmPhase l1Phase : l1Phases) {
phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload());
phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt());
} }
if("1".equals(xmProduct.getBudgetCtrl())){ if("1".equals(xmProduct.getBudgetCtrl())){
tips=xmProjectPhaseService.judgetProductBudget(productId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList()));
tips= xmPhaseService.judgetProductBudget(productId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList()));
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
} }
} }
//找到导入的树中最上面的节点 //找到导入的树中最上面的节点
List<XmProjectPhase> parentNoNulls= xmProjectPhases.stream().filter(i->StringUtils.hasText(i.getParentPhaseId())&&!"0".equals(i.getParentPhaseId())).collect(Collectors.toList());
List<XmPhase> parentNoNulls= xmProjectPhases.stream().filter(i->StringUtils.hasText(i.getParentPhaseId())&&!"0".equals(i.getParentPhaseId())).collect(Collectors.toList());
//根据同一个父亲归类 //根据同一个父亲归类
Map<String,List<XmProjectPhase>> map=new HashMap<>();
for (XmProjectPhase phase : parentNoNulls) {
List<XmProjectPhase> phases=map.get(phase.getParentPhaseId());
Map<String,List<XmPhase>> map=new HashMap<>();
for (XmPhase phase : parentNoNulls) {
List<XmPhase> phases=map.get(phase.getParentPhaseId());
if(phases==null){ if(phases==null){
phases=new ArrayList<>(); phases=new ArrayList<>();
map.put(phase.getParentPhaseId(),phases); map.put(phase.getParentPhaseId(),phases);
} }
phases.add(phase); phases.add(phase);
} }
for (Map.Entry<String, List<XmProjectPhase>> kv : map.entrySet()) {
for (Map.Entry<String, List<XmPhase>> kv : map.entrySet()) {
String parentId=kv.getKey(); String parentId=kv.getKey();
List<XmProjectPhase> children=kv.getValue();
List<XmPhase> children=kv.getValue();
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList());
for (XmProjectPhase child : children) {
for (XmPhase child : children) {
phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt());
} }
if("1".equals(xmProduct.getPhaseBudgetCtrl())) { if("1".equals(xmProduct.getPhaseBudgetCtrl())) {
Tips tips2 = xmProjectPhaseService.judgetPhaseBudget(parentId, phaseTotalBudgetAt, null, null, null, excludeIds);
Tips tips2 = xmPhaseService.judgetPhaseBudget(parentId, phaseTotalBudgetAt, null, null, null, excludeIds);
if (!tips2.isOk()) { if (!tips2.isOk()) {
tips2.setFailureMsg(tips2.getMsg() + " 相关计划为【" + children.stream().map(i -> i.getPhaseName()).collect(Collectors.joining(",")) + "】"); tips2.setFailureMsg(tips2.getMsg() + " 相关计划为【" + children.stream().map(i -> i.getPhaseName()).collect(Collectors.joining(",")) + "】");
return ResponseHelper.failed(tips2); return ResponseHelper.failed(tips2);
@ -705,19 +705,19 @@ public class XmProductPhaseController {
} }
for (XmProjectPhase projectPhase : xmProjectPhases) {
for (XmPhase projectPhase : xmProjectPhases) {
int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).count()+""); int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).count()+"");
if(childrenCnt>0){ if(childrenCnt>0){
projectPhase.setChildrenCnt(childrenCnt); projectPhase.setChildrenCnt(childrenCnt);
projectPhase.setNtype("1"); projectPhase.setNtype("1");
} }
} }
List<XmProjectPhase> xmProjectPhaseListDb=xmProjectPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList()));
List<XmPhase> xmProjectPhaseListDb= xmPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList()));
List<XmProjectPhase> inserts=xmProjectPhases.stream().filter(i->!xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
List<XmProjectPhase> updates=xmProjectPhases.stream().filter(i->xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
xmProjectPhaseService.batchInsertOrUpdate(inserts,updates);
for (XmProjectPhase phase : xmProjectPhases) {
List<XmPhase> inserts=xmProjectPhases.stream().filter(i->!xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
List<XmPhase> 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.getPhaseName(),JSON.toJSONString(phase),null); xmRecordService.addProductPhaseRecord(phase.getProductId(), phase.getId(), "产品-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null);
} }
@ -758,7 +758,7 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
int i= xmProjectPhaseService.loaMenusToXmProductPhase(xmProduct.getId());
int i= xmPhaseService.loaMenusToXmProductPhase(xmProduct.getId());
xmRecordService.addProductPhaseRecord(xmProduct.getId(), "", "产品-计划-汇总统计", "计算项目计划进度","",null); xmRecordService.addProductPhaseRecord(xmProduct.getId(), "", "产品-计划-汇总统计", "计算项目计划进度","",null);
@ -799,7 +799,7 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
xmProjectPhaseService.calcKeyPaths((String) params.get("productId"));
xmPhaseService.calcKeyPaths((String) params.get("productId"));
xmRecordService.addProductPhaseRecord(xmProduct.getId(), "", "产品-计划-关键路径计算", "计算项目计划关键路径","",null); xmRecordService.addProductPhaseRecord(xmProduct.getId(), "", "产品-计划-关键路径计算", "计算项目计划关键路径","",null);
}catch (BizException e) { }catch (BizException e) {
@ -837,7 +837,7 @@ public class XmProductPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
Map<String,Object> data=xmProjectPhaseService.selectTotalProjectAndPhaseBudgetCost((String) params.get("productId"),null);
Map<String,Object> data= xmPhaseService.selectTotalProjectAndPhaseBudgetCost((String) params.get("productId"),null);
m.put("data",data); m.put("data",data);
}catch (BizException e) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();

2
xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
View File

@ -54,7 +54,7 @@ public class XmProjectController {
private XmRecordService xmRecordService; private XmRecordService xmRecordService;
@Autowired @Autowired
private XmProjectPhaseService xmProjectPhaseService;
private XmPhaseService xmProjectPhaseService;
@Value("${mdp.platform-branch-id:platform-branch-001}") @Value("${mdp.platform-branch-id:platform-branch-001}")
String platformBranchId="platform-branch-001"; String platformBranchId="platform-branch-001";

178
xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
View File

@ -11,8 +11,8 @@ import com.mdp.qx.HasQx;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.PubTool; import com.xm.core.PubTool;
import com.xm.core.entity.XmPhase;
import com.xm.core.entity.XmProject; import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmProjectPhase;
import com.xm.core.service.*; import com.xm.core.service.*;
import com.xm.core.vo.XmGroupVo; import com.xm.core.vo.XmGroupVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
@ -47,7 +47,7 @@ public class XmProjectPhaseController {
static Log logger=LogFactory.getLog(XmProjectPhaseController.class); static Log logger=LogFactory.getLog(XmProjectPhaseController.class);
@Autowired @Autowired
private XmProjectPhaseService xmProjectPhaseService;
private XmPhaseService xmPhaseService;
@Autowired @Autowired
private XmGroupService groupService; private XmGroupService groupService;
@ -106,14 +106,14 @@ public class XmProjectPhaseController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
}) })
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response= XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
}) })
@RequestMapping(value="/list",method=RequestMethod.GET) @RequestMapping(value="/list",method=RequestMethod.GET)
public Map<String,Object> listXmProjectPhase( @RequestParam Map<String,Object> xmProjectPhase){ public Map<String,Object> listXmProjectPhase( @RequestParam Map<String,Object> xmProjectPhase){
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmProjectPhase, "ids"); RequestUtils.transformArray(xmProjectPhase, "ids");
PageUtils.startPage(xmProjectPhase); PageUtils.startPage(xmProjectPhase);
List<Map<String,Object>> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表
List<Map<String,Object>> xmProjectPhaseList = xmPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表
PageUtils.responePage(m, xmProjectPhaseList); PageUtils.responePage(m, xmProjectPhaseList);
if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){ if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
@ -129,7 +129,7 @@ public class XmProjectPhaseController {
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);
} }
if(pidPathsSet!=null && pidPathsSet.size()>0){ if(pidPathsSet!=null && pidPathsSet.size()>0){
List<Map<String,Object>> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
List<Map<String,Object>> parentList= xmPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());
if(parentList!=null && parentList.size()>0){ if(parentList!=null && parentList.size()>0){
xmProjectPhaseList.addAll(parentList); xmProjectPhaseList.addAll(parentList);
@ -146,7 +146,7 @@ public class XmProjectPhaseController {
@HasQx(value = "xm_core_xmProjectPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/setPhaseMngUser",method=RequestMethod.POST) @RequestMapping(value="/setPhaseMngUser",method=RequestMethod.POST)
public Map<String,Object> setPhaseMngUser(@RequestBody XmProjectPhase xmProjectPhase) {
public Map<String,Object> setPhaseMngUser(@RequestBody XmPhase xmProjectPhase) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功设置"); Tips tips=new Tips("成功设置");
try{ try{
@ -155,8 +155,8 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
}else{ }else{
XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId());
XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhaseQuery);
XmPhase xmProjectPhaseQuery = new XmPhase(xmProjectPhase.getId());
XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhaseQuery);
if(xmProjectPhaseDb==null){ if(xmProjectPhaseDb==null){
tips.setFailureMsg("计划不存在"); tips.setFailureMsg("计划不存在");
m.put("tips", tips); m.put("tips", tips);
@ -179,11 +179,11 @@ public class XmProjectPhaseController {
return m; return m;
} }
if(tips.isOk()){ if(tips.isOk()){
XmProjectPhase xmProjectPhaseToUpdate=new XmProjectPhase();
XmPhase xmProjectPhaseToUpdate=new XmPhase();
xmProjectPhaseToUpdate.setId(xmProjectPhase.getId()); xmProjectPhaseToUpdate.setId(xmProjectPhase.getId());
xmProjectPhaseToUpdate.setMngUserid(xmProjectPhase.getMngUserid()); xmProjectPhaseToUpdate.setMngUserid(xmProjectPhase.getMngUserid());
xmProjectPhaseToUpdate.setMngUsername(xmProjectPhase.getMngUsername()); xmProjectPhaseToUpdate.setMngUsername(xmProjectPhase.getMngUsername());
this.xmProjectPhaseService.updateSomeFieldByPk(xmProjectPhaseToUpdate);
this.xmPhaseService.updateSomeFieldByPk(xmProjectPhaseToUpdate);
this.xmRecordService.addProjectPhaseRecord(xmProject.getId(),xmProjectPhase.getId(),"项目-计划-设置计划负责人","计划负责人由【"+xmProjectPhaseDb.getMngUsername()+"】变更为【"+xmProjectPhase.getMngUsername()+"】"); this.xmRecordService.addProjectPhaseRecord(xmProject.getId(),xmProjectPhase.getId(),"项目-计划-设置计划负责人","计划负责人由【"+xmProjectPhaseDb.getMngUsername()+"】变更为【"+xmProjectPhase.getMngUsername()+"】");
} }
} }
@ -201,11 +201,11 @@ public class XmProjectPhaseController {
@ApiOperation( value = "新增一条xm_project_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成") @ApiOperation( value = "新增一条xm_project_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成")
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response=XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
}) })
@HasQx(value = "xm_core_xmProjectPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/add",method=RequestMethod.POST) @RequestMapping(value="/add",method=RequestMethod.POST)
public Map<String,Object> addXmProjectPhase(@RequestBody XmProjectPhase xmProjectPhase) {
public Map<String,Object> addXmProjectPhase(@RequestBody XmPhase xmProjectPhase) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功新增一条数据"); Tips tips=new Tips("成功新增一条数据");
try{ try{
@ -213,10 +213,10 @@ public class XmProjectPhaseController {
return ResponseHelper.failed("projectId-0","请上送项目编号"); return ResponseHelper.failed("projectId-0","请上送项目编号");
} }
if(StringUtils.isEmpty(xmProjectPhase.getId())) { if(StringUtils.isEmpty(xmProjectPhase.getId())) {
xmProjectPhase.setId(xmProjectPhaseService.createKey("id"));
xmProjectPhase.setId(xmPhaseService.createKey("id"));
}else{ }else{
XmProjectPhase xmProjectPhaseQuery = new XmProjectPhase(xmProjectPhase.getId());
if(xmProjectPhaseService.countByWhere(xmProjectPhaseQuery)>0){
XmPhase xmProjectPhaseQuery = new XmPhase(xmProjectPhase.getId());
if(xmPhaseService.countByWhere(xmProjectPhaseQuery)>0){
tips.setFailureMsg("编号重复，请修改编号再提交"); tips.setFailureMsg("编号重复，请修改编号再提交");
m.put("tips", tips); m.put("tips", tips);
return m; return m;
@ -245,28 +245,28 @@ public class XmProjectPhaseController {
} }
List<String> excludePhaseIds=new ArrayList<>(); List<String> excludePhaseIds=new ArrayList<>();
excludePhaseIds.add(xmProjectPhase.getId()); excludePhaseIds.add(xmProjectPhase.getId());
xmProjectPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase);
xmPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase);
if(xmProjectPhase.getLvl()==1){ if(xmProjectPhase.getLvl()==1){
if("1".equals(xmProject.getBudgetCtrl())){ if("1".equals(xmProject.getBudgetCtrl())){
tips=xmProjectPhaseService.judgetProjectBudget(xmProject.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
tips= xmPhaseService.judgetProjectBudget(xmProject.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
} }
}else { }else {
if("1".equals(xmProject.getPhaseBudgetCtrl())) { if("1".equals(xmProject.getPhaseBudgetCtrl())) {
tips = xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
tips = xmPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
} }
} }
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
XmProjectPhase parentDb=xmProjectPhaseService.selectOneObject(new XmProjectPhase(xmProjectPhase.getParentPhaseId()));
XmPhase parentDb= xmPhaseService.selectOneObject(new XmPhase(xmProjectPhase.getParentPhaseId()));
if(parentDb==null){ if(parentDb==null){
return ResponseHelper.failed("p-no-exists","上级计划不存在"); return ResponseHelper.failed("p-no-exists","上级计划不存在");
} }
if(!"1".equals(parentDb.getNtype())){ if(!"1".equals(parentDb.getNtype())){
return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划"); return ResponseHelper.failed("p-ntype-no-1","上级【"+parentDb.getPhaseName()+"】不是计划集，不能在其之下建立子计划");
} }
xmProjectPhaseService.insert(xmProjectPhase);
xmPhaseService.insert(xmProjectPhase);
xmRecordService.addProjectPhaseRecord(xmProject.getId(), xmProjectPhase.getId(), "项目-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); xmRecordService.addProjectPhaseRecord(xmProject.getId(), xmProjectPhase.getId(), "项目-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
m.put("data",xmProjectPhase); m.put("data",xmProjectPhase);
}catch (BizException e) { }catch (BizException e) {
@ -286,14 +286,14 @@ public class XmProjectPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/del",method=RequestMethod.POST) @RequestMapping(value="/del",method=RequestMethod.POST)
public Map<String,Object> delXmProjectPhase(@RequestBody XmProjectPhase xmProjectPhase){
public Map<String,Object> delXmProjectPhase(@RequestBody XmPhase xmProjectPhase){
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除一条数据"); Tips tips=new Tips("成功删除一条数据");
try{ try{
if(!StringUtils.hasText(xmProjectPhase.getId())){ if(!StringUtils.hasText(xmProjectPhase.getId())){
return ResponseHelper.failed("id-0","请上送计划编号"); return ResponseHelper.failed("id-0","请上送计划编号");
} }
XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhase);
XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhase);
if(xmProjectPhaseDb==null){ if(xmProjectPhaseDb==null){
return ResponseHelper.failed("data-0","该计划已不存在"); return ResponseHelper.failed("data-0","该计划已不存在");
} }
@ -314,7 +314,7 @@ public class XmProjectPhaseController {
return m; return m;
} }
//检查是否由关联的任务，有则不允许删除 //检查是否由关联的任务，有则不允许删除
Long exists=this.xmProjectPhaseService.checkExistsTask(xmProjectPhase.getId());
Long exists=this.xmPhaseService.checkExistsTask(xmProjectPhase.getId());
if(exists>0) { if(exists>0) {
tips.setFailureMsg("存在"+exists+"条任务,不允许删除"); tips.setFailureMsg("存在"+exists+"条任务,不允许删除");
}else { }else {
@ -322,7 +322,7 @@ public class XmProjectPhaseController {
if(xmProjectPhaseDb.getChildrenCnt()!=null && xmProjectPhaseDb.getChildrenCnt()>0){ if(xmProjectPhaseDb.getChildrenCnt()!=null && xmProjectPhaseDb.getChildrenCnt()>0){
tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除"); tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除");
} else { } else {
xmProjectPhaseService.deleteByPk(xmProjectPhaseDb);
xmPhaseService.deleteByPk(xmProjectPhaseDb);
xmRecordService.addProjectPhaseRecord(xmProjectPhaseDb.getProjectId(), xmProjectPhaseDb.getId(), "项目-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),"",JSON.toJSONString(xmProjectPhaseDb)); xmRecordService.addProjectPhaseRecord(xmProjectPhaseDb.getProjectId(), xmProjectPhaseDb.getId(), "项目-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),"",JSON.toJSONString(xmProjectPhaseDb));
} }
} }
@ -343,18 +343,18 @@ public class XmProjectPhaseController {
/***/ /***/
@ApiOperation( value = "根据主键修改一条xm_project_phase信息",notes="editXmProjectPhase") @ApiOperation( value = "根据主键修改一条xm_project_phase信息",notes="editXmProjectPhase")
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response=XmProjectPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
}) })
@HasQx(value = "xm_core_xmProjectPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/edit",method=RequestMethod.POST) @RequestMapping(value="/edit",method=RequestMethod.POST)
public Map<String,Object> editXmProjectPhase(@RequestBody XmProjectPhase xmProjectPhase) {
public Map<String,Object> editXmProjectPhase(@RequestBody XmPhase xmProjectPhase) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功更新一条数据"); Tips tips=new Tips("成功更新一条数据");
try{ try{
if(!StringUtils.hasText(xmProjectPhase.getId())){ if(!StringUtils.hasText(xmProjectPhase.getId())){
return ResponseHelper.failed("id-0","请上送计划编号"); return ResponseHelper.failed("id-0","请上送计划编号");
} }
XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhase);
XmPhase xmProjectPhaseDb=this.xmPhaseService.selectOneObject(xmProjectPhase);
if(xmProjectPhaseDb==null){ if(xmProjectPhaseDb==null){
return ResponseHelper.failed("data-0","该计划已不存在"); return ResponseHelper.failed("data-0","该计划已不存在");
} }
@ -378,8 +378,8 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase);
xmProjectPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
xmProjectPhase= xmPhaseService.autoCalcWorkload(xmProjectPhase);
xmPhaseService.calcPhaseBudgetAmount(xmProjectPhase);
List<String> excludePhaseIds=new ArrayList<>(); List<String> excludePhaseIds=new ArrayList<>();
excludePhaseIds.add(xmProjectPhase.getId()); excludePhaseIds.add(xmProjectPhase.getId());
@ -387,11 +387,11 @@ public class XmProjectPhaseController {
if(xmProjectPhaseDb.getPhaseBudgetAt()!=null && xmProjectPhaseDb.getPhaseBudgetAt().compareTo(xmProjectPhase.getPhaseBudgetAt())!=0){ if(xmProjectPhaseDb.getPhaseBudgetAt()!=null && xmProjectPhaseDb.getPhaseBudgetAt().compareTo(xmProjectPhase.getPhaseBudgetAt())!=0){
if(xmProjectPhase.getLvl()==1){ if(xmProjectPhase.getLvl()==1){
if("1".equals(xmProject.getBudgetCtrl())){ if("1".equals(xmProject.getBudgetCtrl())){
tips=this.xmProjectPhaseService.judgetProjectBudget(xmProject.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
tips=this.xmPhaseService.judgetProjectBudget(xmProject.getId(),xmProjectPhase.getPhaseBudgetAt(),null,null,null,excludePhaseIds);
} }
}else{ }else{
if("1".equals(xmProject.getPhaseBudgetCtrl())) { if("1".equals(xmProject.getPhaseBudgetCtrl())) {
tips = this.xmProjectPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
tips = this.xmPhaseService.judgetPhaseBudget(xmProjectPhase.getParentPhaseId(), xmProjectPhase.getPhaseBudgetAt(), null, null, null, excludePhaseIds);
} }
} }
@ -399,7 +399,7 @@ public class XmProjectPhaseController {
if(!tips.isOk()) { if(!tips.isOk()) {
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
xmProjectPhaseService.editByPk(xmProjectPhase);
xmPhaseService.editByPk(xmProjectPhase);
xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
m.put("data",xmProjectPhase); m.put("data",xmProjectPhase);
@ -423,7 +423,7 @@ public class XmProjectPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchDel",method=RequestMethod.POST) @RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map<String,Object> batchDelXmProjectPhase(@RequestBody List<XmProjectPhase> xmProjectPhases) {
public Map<String,Object> batchDelXmProjectPhase(@RequestBody List<XmPhase> xmProjectPhases) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除"+(xmProjectPhases==null?0:xmProjectPhases.size())+"条数据"); Tips tips=new Tips("成功删除"+(xmProjectPhases==null?0:xmProjectPhases.size())+"条数据");
try{ try{
@ -432,7 +432,7 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
XmProjectPhase xmProjectPhase=xmProjectPhases.get(0);
XmPhase xmProjectPhase=xmProjectPhases.get(0);
if(!StringUtils.hasText(xmProjectPhase.getProjectId())){ if(!StringUtils.hasText(xmProjectPhase.getProjectId())){
tips.setFailureMsg("项目编号不能为空"); tips.setFailureMsg("项目编号不能为空");
m.put("tips", tips); m.put("tips", tips);
@ -451,26 +451,26 @@ public class XmProjectPhaseController {
return m; return m;
} }
List<String> noQxUsernames=new ArrayList<>(); List<String> noQxUsernames=new ArrayList<>();
List<XmProjectPhase> delPhases=new ArrayList<>();
List<XmProjectPhase> xmProjectPhaseListDb=this.xmProjectPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList()));
for (XmProjectPhase phase : xmProjectPhaseListDb) {
List<XmPhase> delPhases=new ArrayList<>();
List<XmPhase> 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()); boolean meIsHisTeamHead=groupService.checkUserIsOtherUserTeamHead(groupVoList,phase.getMngUserid(),user.getUserid());
if( !meIsPm && !meIsHisTeamHead ){ if( !meIsPm && !meIsHisTeamHead ){
noQxUsernames.add(phase.getMngUsername()); noQxUsernames.add(phase.getMngUsername());
continue; continue;
} }
//检查是否由关联的任务，有则不允许删除 //检查是否由关联的任务，有则不允许删除
Long exists=this.xmProjectPhaseService.checkExistsTask(phase.getId());
Long exists=this.xmPhaseService.checkExistsTask(phase.getId());
if(exists>0) { if(exists>0) {
existsTaskList.add(phase.getPhaseName()); existsTaskList.add(phase.getPhaseName());
}else { }else {
delPhases.add(phase); delPhases.add(phase);
} }
} }
List<XmProjectPhase> canDelNodes=new ArrayList<>();
for (XmProjectPhase phase : delPhases) {
List<XmPhase> canDelNodes=new ArrayList<>();
for (XmPhase phase : delPhases) {
boolean canDelAllChild =xmProjectPhaseService.checkCanDelAllChild(phase,delPhases);
boolean canDelAllChild = xmPhaseService.checkCanDelAllChild(phase,delPhases);
if(!canDelAllChild) { if(!canDelAllChild) {
hasChildList.add(phase.getPhaseName()); hasChildList.add(phase.getPhaseName());
}else { }else {
@ -478,7 +478,7 @@ public class XmProjectPhaseController {
} }
} }
if(canDelNodes.size()>0){ if(canDelNodes.size()>0){
this.xmProjectPhaseService.doBatchDelete(canDelNodes);
this.xmPhaseService.doBatchDelete(canDelNodes);
xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), "", "项目-计划-批量删除计划", "批量删除计划"+canDelNodes.stream().map(i->i.getPhaseName()).collect(Collectors.joining(",")),"",JSON.toJSONString(canDelNodes)); xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), "", "项目-计划-批量删除计划", "批量删除计划"+canDelNodes.stream().map(i->i.getPhaseName()).collect(Collectors.joining(",")),"",JSON.toJSONString(canDelNodes));
} }
@ -519,7 +519,7 @@ public class XmProjectPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST) @RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST)
public Map<String,Object> batchImportFromTemplate(@RequestBody List<XmProjectPhase> xmProjectPhases) {
public Map<String,Object> batchImportFromTemplate(@RequestBody List<XmPhase> xmProjectPhases) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功导入"+xmProjectPhases.size()+"条数据"); Tips tips=new Tips("成功导入"+xmProjectPhases.size()+"条数据");
try{ try{
@ -528,7 +528,7 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
XmProjectPhase xmProjectPhase=xmProjectPhases.get(0);
XmPhase xmProjectPhase=xmProjectPhases.get(0);
if(!StringUtils.hasText(xmProjectPhase.getProjectId())){ if(!StringUtils.hasText(xmProjectPhase.getProjectId())){
return ResponseHelper.failed("projectId-0","请上送项目编号"); return ResponseHelper.failed("projectId-0","请上送项目编号");
@ -544,39 +544,39 @@ public class XmProjectPhaseController {
return m; return m;
} }
String projectId=null; String projectId=null;
for (XmProjectPhase g : xmProjectPhases) {
for (XmPhase g : xmProjectPhases) {
projectId=g.getProjectId(); projectId=g.getProjectId();
g.setMngUserid(user.getUserid()); g.setMngUserid(user.getUserid());
g.setMngUsername(user.getUsername()); g.setMngUsername(user.getUsername());
g=xmProjectPhaseService.autoCalcWorkload(g);
xmProjectPhaseService.calcPhaseBudgetAmount(g);
g= xmPhaseService.autoCalcWorkload(g);
xmPhaseService.calcPhaseBudgetAmount(g);
} }
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmProjectPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下， if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，
//找到导入的树中最上面的节点 //找到导入的树中最上面的节点
List<XmProjectPhase> noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList());
List<XmPhase> noExists=xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList());
//根据同一个父亲归类 //根据同一个父亲归类
Map<String,List<XmProjectPhase>> map=new HashMap<>();
for (XmProjectPhase noExist : noExists) {
List<XmProjectPhase> phases=map.get(noExist.getParentPhaseId());
Map<String,List<XmPhase>> map=new HashMap<>();
for (XmPhase noExist : noExists) {
List<XmPhase> phases=map.get(noExist.getParentPhaseId());
if(phases==null){ if(phases==null){
phases=new ArrayList<>(); phases=new ArrayList<>();
map.put(noExist.getParentPhaseId(),phases); map.put(noExist.getParentPhaseId(),phases);
} }
phases.add(noExist); phases.add(noExist);
} }
for (Map.Entry<String, List<XmProjectPhase>> kv : map.entrySet()) {
for (Map.Entry<String, List<XmPhase>> kv : map.entrySet()) {
String parentId=kv.getKey(); String parentId=kv.getKey();
List<XmProjectPhase> children=kv.getValue();
List<XmPhase> children=kv.getValue();
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList());
for (XmProjectPhase child : children) {
for (XmPhase child : children) {
phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt());
} }
if("1".equals(xmProject.getPhaseBudgetCtrl())){ if("1".equals(xmProject.getPhaseBudgetCtrl())){
Tips tips2=xmProjectPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds);
Tips tips2= xmPhaseService.judgetPhaseBudget(parentId,phaseTotalBudgetAt,null,null,null,excludeIds);
if(!tips2.isOk()){ if(!tips2.isOk()){
tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】"); tips2.setFailureMsg(tips2.getMsg()+" 相关计划为【"+children.stream().map(i->i.getPhaseName()).collect(Collectors.joining(","))+"】");
return ResponseHelper.failed(tips2); return ResponseHelper.failed(tips2);
@ -586,27 +586,27 @@ public class XmProjectPhaseController {
}else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 }else{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算
BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO;
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
for (XmProjectPhase l1Phase : l1Phases) {
for (XmPhase l1Phase : l1Phases) {
phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload());
phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt());
} }
if("1".equals(xmProject.getBudgetCtrl())) { if("1".equals(xmProject.getBudgetCtrl())) {
tips = xmProjectPhaseService.judgetProjectBudget(projectId, phaseTotalBudgetAt, null, null, null, l1Phases.stream().map(i -> i.getId()).collect(Collectors.toList()));
tips = xmPhaseService.judgetProjectBudget(projectId, phaseTotalBudgetAt, null, null, null, l1Phases.stream().map(i -> i.getId()).collect(Collectors.toList()));
if (!tips.isOk()) { if (!tips.isOk()) {
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
} }
} }
if(tips.isOk()) { if(tips.isOk()) {
for (XmProjectPhase projectPhase : xmProjectPhases) {
for (XmPhase projectPhase : xmProjectPhases) {
projectPhase.setMngUsername(user.getUsername()); projectPhase.setMngUsername(user.getUsername());
projectPhase.setMngUserid(user.getUserid()); projectPhase.setMngUserid(user.getUserid());
projectPhase.setCtime(new Date()); projectPhase.setCtime(new Date());
projectPhase.setLtime(new Date()); projectPhase.setLtime(new Date());
} }
xmProjectPhaseService.doBatchInsert(xmProjectPhases);
xmPhaseService.doBatchInsert(xmProjectPhases);
for (XmProjectPhase phase : xmProjectPhases) {
for (XmPhase phase : xmProjectPhases) {
xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null);
} }
@ -629,7 +629,7 @@ public class XmProjectPhaseController {
}) })
@HasQx(value = "xm_core_xmProjectPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @HasQx(value = "xm_core_xmProjectPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST) @RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST)
public Map<String,Object> batchSaveBudget(@RequestBody List<XmProjectPhase> xmProjectPhases) {
public Map<String,Object> batchSaveBudget(@RequestBody List<XmPhase> xmProjectPhases) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功修改"+xmProjectPhases.size()+"条数据"); Tips tips=new Tips("成功修改"+xmProjectPhases.size()+"条数据");
try{ try{
@ -638,7 +638,7 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
XmProjectPhase xmProjectPhase=xmProjectPhases.get(0);
XmPhase xmProjectPhase=xmProjectPhases.get(0);
if(!StringUtils.hasText(xmProjectPhase.getProjectId())){ if(!StringUtils.hasText(xmProjectPhase.getProjectId())){
return ResponseHelper.failed("projectId-0","请上送项目编号"); return ResponseHelper.failed("projectId-0","请上送项目编号");
} }
@ -654,49 +654,49 @@ public class XmProjectPhaseController {
return m; return m;
} }
String projectId=null; String projectId=null;
for (XmProjectPhase g : xmProjectPhases) {
for (XmPhase g : xmProjectPhases) {
projectId=g.getProjectId(); projectId=g.getProjectId();
g=xmProjectPhaseService.autoCalcWorkload(g);
xmProjectPhaseService.calcPhaseBudgetAmount(g);
g= xmPhaseService.autoCalcWorkload(g);
xmPhaseService.calcPhaseBudgetAmount(g);
} }
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmProjectPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
xmPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases);
List<XmPhase> l1Phases=xmProjectPhases.stream().filter(i->1==i.getLvl()).collect(Collectors.toList());
if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算 if(l1Phases==null ||l1Phases.size()==0){//如果是导入到某个计划之下，{//直接导入到项目之下，需要判断当前一级预算是否超出项目总预算
BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO; BigDecimal phaseTotalBudgetWorkload=BigDecimal.ZERO;
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
for (XmProjectPhase l1Phase : l1Phases) {
for (XmPhase l1Phase : l1Phases) {
phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload()); phaseTotalBudgetWorkload=phaseTotalBudgetWorkload.add(l1Phase.getPhaseBudgetWorkload());
phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(l1Phase.getPhaseBudgetAt());
} }
if("1".equals(xmProject.getBudgetCtrl())){ if("1".equals(xmProject.getBudgetCtrl())){
tips=xmProjectPhaseService.judgetProjectBudget(projectId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList()));
tips= xmPhaseService.judgetProjectBudget(projectId,phaseTotalBudgetAt,null,null,null,l1Phases.stream().map(i->i.getId()).collect(Collectors.toList()));
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
} }
} }
//找到导入的树中最上面的节点 //找到导入的树中最上面的节点
List<XmProjectPhase> parentNoNulls= xmProjectPhases.stream().filter(i->StringUtils.hasText(i.getParentPhaseId())&&!"0".equals(i.getParentPhaseId())).collect(Collectors.toList());
List<XmPhase> parentNoNulls= xmProjectPhases.stream().filter(i->StringUtils.hasText(i.getParentPhaseId())&&!"0".equals(i.getParentPhaseId())).collect(Collectors.toList());
//根据同一个父亲归类 //根据同一个父亲归类
Map<String,List<XmProjectPhase>> map=new HashMap<>();
for (XmProjectPhase phase : parentNoNulls) {
List<XmProjectPhase> phases=map.get(phase.getParentPhaseId());
Map<String,List<XmPhase>> map=new HashMap<>();
for (XmPhase phase : parentNoNulls) {
List<XmPhase> phases=map.get(phase.getParentPhaseId());
if(phases==null){ if(phases==null){
phases=new ArrayList<>(); phases=new ArrayList<>();
map.put(phase.getParentPhaseId(),phases); map.put(phase.getParentPhaseId(),phases);
} }
phases.add(phase); phases.add(phase);
} }
for (Map.Entry<String, List<XmProjectPhase>> kv : map.entrySet()) {
for (Map.Entry<String, List<XmPhase>> kv : map.entrySet()) {
String parentId=kv.getKey(); String parentId=kv.getKey();
List<XmProjectPhase> children=kv.getValue();
List<XmPhase> children=kv.getValue();
BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO; BigDecimal phaseTotalBudgetAt=BigDecimal.ZERO;
List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList()); List<String> excludeIds=children.stream().map(i->i.getId()).collect(Collectors.toList());
for (XmProjectPhase child : children) {
for (XmPhase child : children) {
phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt()); phaseTotalBudgetAt=phaseTotalBudgetAt.add(child.getPhaseBudgetAt());
} }
if("1".equals(xmProject.getPhaseBudgetCtrl())) { if("1".equals(xmProject.getPhaseBudgetCtrl())) {
Tips tips2 = xmProjectPhaseService.judgetPhaseBudget(parentId, phaseTotalBudgetAt, null, null, null, excludeIds);
Tips tips2 = xmPhaseService.judgetPhaseBudget(parentId, phaseTotalBudgetAt, null, null, null, excludeIds);
if (!tips2.isOk()) { if (!tips2.isOk()) {
tips2.setFailureMsg(tips2.getMsg() + " 相关计划为【" + children.stream().map(i -> i.getPhaseName()).collect(Collectors.joining(",")) + "】"); tips2.setFailureMsg(tips2.getMsg() + " 相关计划为【" + children.stream().map(i -> i.getPhaseName()).collect(Collectors.joining(",")) + "】");
return ResponseHelper.failed(tips2); return ResponseHelper.failed(tips2);
@ -705,19 +705,19 @@ public class XmProjectPhaseController {
} }
for (XmProjectPhase projectPhase : xmProjectPhases) {
for (XmPhase projectPhase : xmProjectPhases) {
int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).count()+""); int childrenCnt=Integer.valueOf(xmProjectPhases.stream().filter(i->projectPhase.getId().equals(i.getParentPhaseId())).count()+"");
if(childrenCnt>0){ if(childrenCnt>0){
projectPhase.setChildrenCnt(childrenCnt); projectPhase.setChildrenCnt(childrenCnt);
projectPhase.setNtype("1"); projectPhase.setNtype("1");
} }
} }
List<XmProjectPhase> xmProjectPhaseListDb=xmProjectPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList()));
List<XmPhase> xmProjectPhaseListDb= xmPhaseService.selectListByIds(xmProjectPhases.stream().map(i->i.getId()).collect(Collectors.toList()));
List<XmProjectPhase> inserts=xmProjectPhases.stream().filter(i->!xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
List<XmProjectPhase> updates=xmProjectPhases.stream().filter(i->xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
xmProjectPhaseService.batchInsertOrUpdate(inserts,updates);
for (XmProjectPhase phase : xmProjectPhases) {
List<XmPhase> inserts=xmProjectPhases.stream().filter(i->!xmProjectPhaseListDb.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
List<XmPhase> 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.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null);
} }
@ -758,7 +758,7 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
int i= xmProjectPhaseService.loadTasksToXmProjectPhase(xmProject.getId());
int i= xmPhaseService.loadTasksToXmProjectPhase(xmProject.getId());
xmRecordService.addProjectPhaseRecord(xmProject.getId(), "", "项目-计划-汇总统计", "计算项目计划进度","",null); xmRecordService.addProjectPhaseRecord(xmProject.getId(), "", "项目-计划-汇总统计", "计算项目计划进度","",null);
@ -799,7 +799,7 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
xmProjectPhaseService.calcKeyPaths((String) params.get("projectId"));
xmPhaseService.calcKeyPaths((String) params.get("projectId"));
xmRecordService.addProjectPhaseRecord(xmProject.getId(), "", "项目-计划-关键路径计算", "计算项目计划关键路径","",null); xmRecordService.addProjectPhaseRecord(xmProject.getId(), "", "项目-计划-关键路径计算", "计算项目计划关键路径","",null);
}catch (BizException e) { }catch (BizException e) {
@ -837,7 +837,7 @@ public class XmProjectPhaseController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
Map<String,Object> data=xmProjectPhaseService.selectTotalProjectAndPhaseBudgetCost((String) params.get("projectId"),null);
Map<String,Object> data= xmPhaseService.selectTotalProjectAndPhaseBudgetCost((String) params.get("projectId"),null);
m.put("data",data); m.put("data",data);
}catch (BizException e) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();

3
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
View File

@ -19,7 +19,6 @@ import com.xm.core.service.*;
import com.xm.core.service.cache.XmTaskCacheService; import com.xm.core.service.cache.XmTaskCacheService;
import com.xm.core.service.push.XmPushMsgService; import com.xm.core.service.push.XmPushMsgService;
import com.xm.core.vo.BatchRelTasksWithMenu; import com.xm.core.vo.BatchRelTasksWithMenu;
import com.xm.core.vo.BatchRelTasksWithPhase;
import com.xm.core.vo.XmGroupVo; import com.xm.core.vo.XmGroupVo;
import com.xm.core.vo.XmTaskVo; import com.xm.core.vo.XmTaskVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
@ -70,7 +69,7 @@ public class XmTaskController {
@Autowired @Autowired
private XmProjectService xmProjectService; private XmProjectService xmProjectService;
@Autowired @Autowired
XmProjectPhaseService xmProjectPhaseService;
XmPhaseService xmProjectPhaseService;
@Autowired @Autowired
XmMenuService xmMenusService; XmMenuService xmMenusService;

xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java → xm-core/src/main/java/com/xm/core/entity/XmPhase.java
View File

xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java → xm-core/src/main/java/com/xm/core/service/XmPhaseService.java
View File

10
xm-core/src/main/java/com/xm/core/service/XmProductService.java
View File

@ -45,7 +45,7 @@ public class XmProductService extends BaseService {
@Autowired @Autowired
XmProjectPhaseService xmProjectPhaseService;
XmPhaseService xmProjectPhaseService;
@ -140,15 +140,15 @@ public class XmProductService extends BaseService {
Map<String,String> newPhaseIdMap=new HashMap<>(); Map<String,String> newPhaseIdMap=new HashMap<>();
if("1".equals(xmProduct.getCopyPhase())){ if("1".equals(xmProduct.getCopyPhase())){
XmProjectPhase phaseQuery=new XmProjectPhase();
XmPhase phaseQuery=new XmPhase();
phaseQuery.setProductId(xmProductDb.getId()); phaseQuery.setProductId(xmProductDb.getId());
List<XmProjectPhase> xmProjectPhases=this.xmProjectPhaseService.selectListByWhere(phaseQuery);
List<XmPhase> xmProjectPhases=this.xmProjectPhaseService.selectListByWhere(phaseQuery);
if(xmProjectPhases!=null && xmProjectPhases.size()>0){ if(xmProjectPhases!=null && xmProjectPhases.size()>0){
for (XmProjectPhase node : xmProjectPhases) {
for (XmPhase node : xmProjectPhases) {
String id=this.xmProjectPhaseService.createKey("id"); String id=this.xmProjectPhaseService.createKey("id");
newPhaseIdMap.put(node.getId(),id); newPhaseIdMap.put(node.getId(),id);
} }
for (XmProjectPhase node : xmProjectPhases) {
for (XmPhase node : xmProjectPhases) {
String oldId=node.getId(); String oldId=node.getId();
String newId=newPhaseIdMap.get(oldId); String newId=newPhaseIdMap.get(oldId);
node.setProjectId(null); node.setProjectId(null);

10
xm-core/src/main/java/com/xm/core/service/XmProjectService.java
View File

@ -57,7 +57,7 @@ public class XmProjectService extends BaseService {
@Autowired @Autowired
XmProjectCacheService xmProjectCacheService; XmProjectCacheService xmProjectCacheService;
@Autowired @Autowired
XmProjectPhaseService xmProjectPhaseService;
XmPhaseService xmProjectPhaseService;
@Autowired @Autowired
XmGroupService groupService; XmGroupService groupService;
@ -116,17 +116,17 @@ public class XmProjectService extends BaseService {
xmProjectTo.setPmUsername(user.getUsername()); xmProjectTo.setPmUsername(user.getUsername());
this.saveProject(xmProjectTo); this.saveProject(xmProjectTo);
XmProjectPhase phaseQuery=new XmProjectPhase();
XmPhase phaseQuery=new XmPhase();
phaseQuery.setProjectId(xmProjectDb.getId()); phaseQuery.setProjectId(xmProjectDb.getId());
Map<String,String> newPhaseIdMap=new HashMap<>(); Map<String,String> newPhaseIdMap=new HashMap<>();
if("1".equals(xmProject.getCopyPhase()) ||"1".equals(xmProject.getCopyTask())){ if("1".equals(xmProject.getCopyPhase()) ||"1".equals(xmProject.getCopyTask())){
List<XmProjectPhase> xmProjectPhases=this.xmProjectPhaseService.selectListByWhere(phaseQuery);
List<XmPhase> xmProjectPhases=this.xmProjectPhaseService.selectListByWhere(phaseQuery);
if(xmProjectPhases!=null && xmProjectPhases.size()>0){ if(xmProjectPhases!=null && xmProjectPhases.size()>0){
for (XmProjectPhase node : xmProjectPhases) {
for (XmPhase node : xmProjectPhases) {
String id=this.xmProjectPhaseService.createKey("id"); String id=this.xmProjectPhaseService.createKey("id");
newPhaseIdMap.put(node.getId(),id); newPhaseIdMap.put(node.getId(),id);
} }
for (XmProjectPhase node : xmProjectPhases) {
for (XmPhase node : xmProjectPhases) {
String oldId=node.getId(); String oldId=node.getId();
String newId=newPhaseIdMap.get(oldId); String newId=newPhaseIdMap.get(oldId);
node.setProjectId(xmProjectTo.getId()); node.setProjectId(xmProjectTo.getId());

xm-core/src/main/java/com/xm/core/vo/XmProjectPhaseVo.java → xm-core/src/main/java/com/xm/core/vo/XmPhaseVo.java
View File

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xm.core.entity.XmProjectPhase">
<mapper namespace="com.xm.core.entity.XmPhase">
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 --> <!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
@ -229,7 +229,7 @@
</foreach> </foreach>
and res.ntype='1' and res.ntype='1'
</update> </update>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectPhase">
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmPhase">
select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res where res.id in select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res where res.id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" > <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item} #{item}
@ -259,7 +259,7 @@
</select> </select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> --> <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectPhase" resultType="com.xm.core.entity.XmProjectPhase">
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmPhase" resultType="com.xm.core.entity.XmPhase">
select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res
<where> <where>
<include refid="where"/> <include refid="where"/>
@ -267,7 +267,7 @@
</select> </select>
<!-- 通过主键查询获取数据对象 返回object --> <!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectPhase" resultType="com.xm.core.entity.XmProjectPhase">
<select id="selectOneObject" parameterType="com.xm.core.entity.XmPhase" resultType="com.xm.core.entity.XmPhase">
select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res
where where
res.id = #{id} res.id = #{id}
@ -280,14 +280,14 @@
res.id = #{id} res.id = #{id}
</select> </select>
<!-- 获取数据条目 返回long --> <!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectPhase" resultType="long">
<select id="countByWhere" parameterType="com.xm.core.entity.XmPhase" resultType="long">
select count(1) from xm_project_phase res select count(1) from xm_project_phase res
<where> <where>
<include refid="where"/> <include refid="where"/>
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectPhase" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmPhase" useGeneratedKeys="false" keyProperty="id">
insert into xm_project_phase( insert into xm_project_phase(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
@ -296,7 +296,7 @@
</insert> </insert>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectPhase">
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmPhase">
delete from xm_project_phase res delete from xm_project_phase res
<where> <where>
<include refid="where"/> <include refid="where"/>
@ -304,13 +304,13 @@
</delete> </delete>
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectPhase">
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmPhase">
delete from xm_project_phase delete from xm_project_phase
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectPhase">
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmPhase">
update xm_project_phase update xm_project_phase
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
@ -319,7 +319,7 @@
</update> </update>
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectPhase">
<update id="updateByPk" parameterType="com.xm.core.entity.XmPhase">
update xm_project_phase update xm_project_phase
<set> <set>
<include refid="set"/> <include refid="set"/>

Write Preview
Loading…
Cancel
Save