Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
158faba7ba
  1. 9
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 2
      xm-core/src/main/java/com/xm/core/service/XmProjectService.java

9
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -149,6 +149,9 @@ public class XmTaskController {
String id= (String) map.get("id"); String id= (String) map.get("id");
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
if(pidPaths.length()<=2){
continue;
}
pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
} }
List<Map<String,Object>> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); List<Map<String,Object>> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
@ -242,7 +245,11 @@ public class XmTaskController {
String id= (String) map.get("id"); String id= (String) map.get("id");
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=3){
continue;
}
pidPathsSet.add(pidPaths);
} }
List<Map<String,Object>> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); List<Map<String,Object>> parentList=xmTaskService.getTask(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());

2
xm-core/src/main/java/com/xm/core/service/XmProjectService.java

@ -134,7 +134,7 @@ public class XmProjectService extends BaseService {
String newId=newTaskIdMap.get(oldId); String newId=newTaskIdMap.get(oldId);
node.setProjectId(xmProjectTo.getId()); node.setProjectId(xmProjectTo.getId());
node.setId(newId); node.setId(newId);
node.setParentTaskid(newIdMap.get(node.getParentTaskid()));
node.setParentTaskid(newTaskIdMap.get(node.getParentTaskid()));
node.setCbranchId(user.getBranchId()); node.setCbranchId(user.getBranchId());
node.setCdeptid(user.getDeptid()); node.setCdeptid(user.getDeptid());
node.setCreateUsername(user.getUsername()); node.setCreateUsername(user.getUsername());

Loading…
Cancel
Save