Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
18280487ce
  1. 1
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  2. 16
      xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java

1
xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java

@ -577,6 +577,7 @@ public class XmProjectPhaseController {
Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds);
if(judgetTips.isOk()) {
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList()));
xmProjectPhaseService.batchInsertOrUpdate(xmProjectPhases);
for (XmProjectPhase phase : xmProjectPhases) {
xmRecordService.addXmPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null);

16
xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java

@ -205,15 +205,21 @@ public class XmProjectPhaseService extends BaseService {
}
if(addList.size()>0) {
this.batchInsert(addList);
List<XmProjectPhase> list= xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList());
list=list.stream().filter(i->StringUtils.hasText(i.getParentPhaseId())).collect(Collectors.toList());
if(list.size()>0){
this.updateChildrenCntByIds(list.stream().map(i->i.getParentPhaseId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()));
}
}
if(editList.size()>0) {
this.batchUpdate(editList);
}
List<String> ids=new ArrayList<>();
List<XmProjectPhase> list= xmProjectPhases.stream().filter(i->!xmProjectPhases.stream().filter(k->k.getId().equals(i.getParentPhaseId())).findAny().isPresent()).collect(Collectors.toList());
list=list.stream().filter(i->StringUtils.hasText(i.getParentPhaseId())).collect(Collectors.toList());
ids=list.stream().map(i->i.getParentPhaseId()).collect(Collectors.toList());
ids=ids.stream().collect(Collectors.toSet()).stream().collect(Collectors.toList());
if(list.size()>0){
this.updateChildrenCntByIds(ids);
}
}
public void calcKeyPaths(String projectId) {

Loading…
Cancel
Save