Browse Source

添加节点类型、标签等

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

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

@ -91,7 +91,7 @@ public class XmMenuController {
} }
List<Map<String,Object>> xmMenuList = xmMenuService.selectListMapByWhere(xmMenu); //列出XmMenu列表 List<Map<String,Object>> xmMenuList = xmMenuService.selectListMapByWhere(xmMenu); //列出XmMenu列表
PageUtils.responePage(m, xmMenuList); PageUtils.responePage(m, xmMenuList);
if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){
if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>(); Set<String> idSet=new HashSet<>();
for (Map<String, Object> map : xmMenuList) { for (Map<String, Object> map : xmMenuList) {
@ -136,7 +136,7 @@ public class XmMenuController {
} }
List<Map<String,Object>> xmMenuList = xmMenuService.selectListMapByWhereWithState(xmMenu); //列出XmMenu列表 List<Map<String,Object>> xmMenuList = xmMenuService.selectListMapByWhereWithState(xmMenu); //列出XmMenu列表
PageUtils.responePage(m, xmMenuList); PageUtils.responePage(m, xmMenuList);
if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){
if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>(); Set<String> idSet=new HashSet<>();
for (Map<String, Object> map : xmMenuList) { for (Map<String, Object> map : xmMenuList) {
@ -167,7 +167,7 @@ public class XmMenuController {
}else { }else {
List<Map<String,Object>> xmMenuList = xmMenuService.selectListMapByWhereWithPlan(xmMenu); //列出XmMenu列表 List<Map<String,Object>> xmMenuList = xmMenuService.selectListMapByWhereWithPlan(xmMenu); //列出XmMenu列表
PageUtils.responePage(m, xmMenuList); PageUtils.responePage(m, xmMenuList);
if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){
if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>(); Set<String> idSet=new HashSet<>();
for (Map<String, Object> map : xmMenuList) { for (Map<String, Object> map : xmMenuList) {

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

@ -117,7 +117,7 @@ public class XmProjectPhaseController {
PageUtils.startPage(xmProjectPhase); PageUtils.startPage(xmProjectPhase);
List<Map<String,Object>> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表 List<Map<String,Object>> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表
PageUtils.responePage(m, xmProjectPhaseList); PageUtils.responePage(m, xmProjectPhaseList);
if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop"))){
if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>(); Set<String> idSet=new HashSet<>();
for (Map<String, Object> map : xmProjectPhaseList) { for (Map<String, Object> map : xmProjectPhaseList) {

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

@ -142,7 +142,7 @@ public class XmTaskController {
} }
List<Map<String,Object>> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 List<Map<String,Object>> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表
PageUtils.responePage(m,xmTaskVoList); PageUtils.responePage(m,xmTaskVoList);
if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))){
if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))&& xmTaskVoList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>(); Set<String> idSet=new HashSet<>();
for (Map<String, Object> map : xmTaskVoList) { for (Map<String, Object> map : xmTaskVoList) {
@ -234,7 +234,7 @@ public class XmTaskController {
}else { }else {
xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表
PageUtils.responePage(m,xmTaskVoList); PageUtils.responePage(m,xmTaskVoList);
if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))){
if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop")) && xmTaskVoList.size()>0){
Set<String> pidPathsSet=new HashSet<>(); Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>(); Set<String> idSet=new HashSet<>();

Loading…
Cancel
Save