Browse Source

修改导入wbs错误提示信息细节

recovery
ma 4 years ago
parent
commit
515d047154
  1. 8
      tall/src/main/java/com/ccsens/tall/service/ExcelService.java
  2. 8
      util/src/main/java/com/ccsens/util/CodeEnum.java

8
tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@ -401,8 +401,10 @@ public class ExcelService implements IExcelService {
String regex = ",|,|;|;|、|/"; String regex = ",|,|;|;|、|/";
String[] split = memberCell.split(regex); String[] split = memberCell.split(regex);
String memberName ="";
for (int j = 0; j < split.length; j++) { for (int j = 0; j < split.length; j++) {
ProMemberRole memberRole = null; ProMemberRole memberRole = null;
memberName = split[j];
for (ProMember member : proMembers) { for (ProMember member : proMembers) {
if (split[j].equalsIgnoreCase(member.getNickname())) { if (split[j].equalsIgnoreCase(member.getNickname())) {
memberRole = new ProMemberRole(); memberRole = new ProMemberRole();
@ -414,7 +416,7 @@ public class ExcelService implements IExcelService {
} }
} }
if (ObjectUtil.isNull(memberRole)) { if (ObjectUtil.isNull(memberRole)) {
throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(wbsSheet.getSheetName() + (i+1))); throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsgAndMemberName(wbsSheet.getSheetName() + (i+1),memberName));
} }
} }
// ProMemberRole memberRole = null; // ProMemberRole memberRole = null;
@ -467,7 +469,9 @@ public class ExcelService implements IExcelService {
} }
if (ObjectUtil.isNotNull(excludeRoleCells)) { if (ObjectUtil.isNotNull(excludeRoleCells)) {
String noLookName = "";
for (int a = 0; a < excludeRoleCells.length; a++) { for (int a = 0; a < excludeRoleCells.length; a++) {
noLookName = excludeRoleCells[a];
ProRoleExclude excludeRole = new ProRoleExclude(); ProRoleExclude excludeRole = new ProRoleExclude();
excludeRole.setId(snowflake.nextId()); excludeRole.setId(snowflake.nextId());
excludeRole.setRoleId(proRoleId); excludeRole.setRoleId(proRoleId);
@ -481,7 +485,7 @@ public class ExcelService implements IExcelService {
} }
} }
if (ObjectUtil.isNull(roleId)) { if (ObjectUtil.isNull(roleId)) {
throw new BaseException(CodeEnum.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName() + (i+1))); throw new BaseException(CodeEnum.WBS_NOT_FIND_ROLE.addMsgAndNoLookName(wbsSheet.getSheetName() + (i+1),noLookName));
} }
} }
excludeRoleService.saveExcludeRole(excludeRole); excludeRoleService.saveExcludeRole(excludeRole);

8
util/src/main/java/com/ccsens/util/CodeEnum.java

@ -232,6 +232,14 @@ public enum CodeEnum {
this.msg = msg+"行:"+this.msg; this.msg = msg+"行:"+this.msg;
return this; return this;
} }
public CodeEnum addMsgAndMemberName(String msg,String memberName){
this.msg = msg+"行:成员["+memberName+"]"+this.msg;
return this;
}
public CodeEnum addMsgAndNoLookName(String msg,String noLookName){
this.msg = msg+"行:对谁不可见成员["+noLookName+"]"+this.msg;
return this;
}
public CodeEnum notProject(String msg) { public CodeEnum notProject(String msg) {
this.msg = msg + "找不到项目信息"; this.msg = msg + "找不到项目信息";
return this; return this;

Loading…
Cancel
Save