Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
3d57c612ad
  1. 12
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  2. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  3. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

12
xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@ -98,7 +98,11 @@ public class XmMenuController {
String id= (String) map.get("menuId");
idSet.add(id);
String pidPaths= (String) map.get("pidPaths");
pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
continue;
}
pidPathsSet.add(pidPaths);
}
List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList());
@ -143,7 +147,11 @@ public class XmMenuController {
String id= (String) map.get("menuId");
idSet.add(id);
String pidPaths= (String) map.get("pidPaths");
pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
continue;
}
pidPathsSet.add(pidPaths);
}
List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhereWithState(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList());

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

@ -124,7 +124,11 @@ public class XmProjectPhaseController {
String id= (String) map.get("id");
idSet.add(id);
String pidPaths= (String) map.get("pidPaths");
pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
continue;
}
pidPathsSet.add(pidPaths);
}
List<Map<String,Object>> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());

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

@ -149,10 +149,11 @@ public class XmTaskController {
String id= (String) map.get("id");
idSet.add(id);
String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
continue;
}
pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
pidPathsSet.add(pidPaths);
}
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());

Loading…
Cancel
Save