Browse Source

4.266

recovery
hyy-alt 4 years ago
parent
commit
3eb9238f69
  1. 8
      tall/src/main/java/com/ccsens/tall/service/ExcelService.java
  2. 4
      tall/src/main/resources/application.yml
  3. 5
      util/src/main/java/com/ccsens/util/CodeEnum.java

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

@ -171,6 +171,7 @@ public class ExcelService implements IExcelService {
if (taskStart == 0) {
throw new BaseException(CodeEnum.WSB_NOT_TASK_HEADER);
}
//读项目信息
readProject(wbsSheet, projectInfoStart, projectInfoEnd, currentUserId, sysProject);
//读项目成员
readMember(wbsSheet, memberSheet, memberStart, memberEnd, sysProject, proRoles, proMembers);
@ -201,6 +202,13 @@ public class ExcelService implements IExcelService {
}
String projectName = ExcelUtil.getCellValue(row.getCell(0));
if (StrUtil.isNotEmpty(projectName)) {
//导入wbs时,项目名不能重复(当前用户创建的项目内名字不能重复)
SysProjectExample sysProjectExample = new SysProjectExample();
sysProjectExample.createCriteria().andCreatorIdEqualTo(currentUserId).andNameEqualTo(projectName);
List<SysProject> sysProjectList = sysProjectDao.selectByExample(sysProjectExample);
if(CollectionUtil.isNotEmpty(sysProjectList)){
throw new BaseException(CodeEnum.WBS_PROJECT_NAME_REPEAT);
}
String begin = ExcelUtil.getCellValue(row.getCell(3));
String end = ExcelUtil.getCellValue(row.getCell(4));

4
tall/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring:
profiles:
active: test
include: util-test,common
active: dev
include: util-dev,common

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

@ -208,7 +208,10 @@ public enum CodeEnum {
WBS_TASK_START_TIME_ERROR(168,"任务开始时间格式错误,请检查后操作",true),
WBS_TASK_END_TIME_ERROR(169,"任务结束时间格式错误,请检查后操作",true),
CANNOT_DELETE_PM(170,"无法删除项目经理",true),
LABEL_TOO_LONG(170,"标签长度过长,请不要超过六个字",true),
LABEL_TOO_LONG(171,"标签长度过长,请不要超过六个字",true),
WBS_PROJECT_NAME_REPEAT(172,"项目名称不能重复",true),
;

Loading…
Cancel
Save