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

添加节点类型、标签等

master
陈裕财 4 years ago
parent
5ec91fd7e7
commit
9c3b72d5c8
5 changed files with 16 additions and 16 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. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
  2. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java
  3. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
  4. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java
  5. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

8
xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
View File

@ -155,9 +155,9 @@ public class XmIterationMenuController {
msgs.add("有"+notJoins.size()+"个需求未加入迭代，无需移出。【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); msgs.add("有"+notJoins.size()+"个需求未加入迭代，无需移出。【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(canDels.size()==0){ if(canDels.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
}else { }else {
tips.setOkMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
} }
}catch (BizException e) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();
@ -227,9 +227,9 @@ public class XmIterationMenuController {
msgs.add("有"+ntype1.size()+"个为需求集，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); msgs.add("有"+ntype1.size()+"个为需求集，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(canAdds.size()==0){ if(canAdds.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
}else { }else {
tips.setOkMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
} }
}catch (BizException e) { }catch (BizException e) {

8
xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java
View File

@ -152,9 +152,9 @@ public class XmPhaseMenuController {
msgs.add("有"+notJoins.size()+"个需求未加入计划，无需移出，【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); msgs.add("有"+notJoins.size()+"个需求未加入计划，无需移出，【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(canDels.size()==0){ if(canDels.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
}else { }else {
tips.setOkMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
} }
}catch (BizException e) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();
@ -229,9 +229,9 @@ public class XmPhaseMenuController {
msgs.add("有"+ntype1.size()+"个需求为需求集，不用加入计划。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); msgs.add("有"+ntype1.size()+"个需求为需求集，不用加入计划。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(canAdds.size()==0){ if(canAdds.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
}else { }else {
tips.setOkMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
} }
}catch (BizException e) { }catch (BizException e) {

4
xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
View File

@ -406,10 +406,10 @@ public class XmProductController {
tips.setOkMsg(msg); tips.setOkMsg(msg);
}else{ }else{
if(errTips.size()>0 && canDelList.size()>0){ if(errTips.size()>0 && canDelList.size()>0){
String errmsg=errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(";"));
String errmsg=errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" "));
tips.setOkMsg(msg+"\n"+errmsg); tips.setOkMsg(msg+"\n"+errmsg);
}else{ }else{
tips.setFailureMsg(errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(";")));
tips.setFailureMsg(errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" ")));
} }
} }
return tips; return tips;

8
xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java
View File

@ -464,9 +464,9 @@ public class XmProjectGroupUserController {
msg.add("以下"+noAddUsers.size()+"个小组用户无需新增。【"+noAddUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】"); msg.add("以下"+noAddUsers.size()+"个小组用户无需新增。【"+noAddUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】");
} }
if(canAddUsers.size()!=0){ if(canAddUsers.size()!=0){
tips.setOkMsg(msg.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msg.stream().collect(Collectors.joining(" ")));
}else{ }else{
tips.setFailureMsg(msg.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msg.stream().collect(Collectors.joining(" ")));
} }
groupUsersMap.forEach((groupId,groupUsers)->{ groupUsersMap.forEach((groupId,groupUsers)->{
@ -588,9 +588,9 @@ public class XmProjectGroupUserController {
msg.add("以下"+noDelUsers.size()+"个小组用户无权限删除。【"+noDelUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】"); msg.add("以下"+noDelUsers.size()+"个小组用户无权限删除。【"+noDelUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】");
} }
if(canDelUsers.size()!=0){ if(canDelUsers.size()!=0){
tips.setOkMsg(msg.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msg.stream().collect(Collectors.joining(" ")));
}else{ }else{
tips.setFailureMsg(msg.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msg.stream().collect(Collectors.joining(" ")));
} }
groupUsersMap.forEach((groupId,groupUsers)->{ groupUsersMap.forEach((groupId,groupUsers)->{

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

@ -1053,9 +1053,9 @@ public class XmTaskController {
msgs.add("以下"+existsExecuserList.size()+"个任务存在待结算的执行人，不能删除。【"+existsExecuserList.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); msgs.add("以下"+existsExecuserList.size()+"个任务存在待结算的执行人，不能删除。【"+existsExecuserList.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
} }
if(canDelNodes.size()==0){ if(canDelNodes.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
}else{ }else{
tips.setOkMsg(msgs.stream().collect(Collectors.joining(";")));
tips.setOkMsg(msgs.stream().collect(Collectors.joining(" ")));
} }
}catch (BizException e) { }catch (BizException e) {

Write Preview
Loading…
Cancel
Save