From 3eb9238f694c54b88a3ccc4401ffafce575f930f Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Mon, 26 Apr 2021 21:20:53 +0800 Subject: [PATCH 1/4] 4.266 --- .../main/java/com/ccsens/tall/service/ExcelService.java | 8 ++++++++ tall/src/main/resources/application.yml | 4 ++-- util/src/main/java/com/ccsens/util/CodeEnum.java | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index a7d7c7a2..40e5c2ba 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/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 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)); diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index bd6c9fe4..07007519 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/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), + ; From 1632a69c3c6f5d1b6db5b2903a86b7d585d876a6 Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Tue, 27 Apr 2021 09:26:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=85=A5wbs=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=EF=BC=88=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=86=85=E5=90=8D=E5=AD=97=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tall/src/main/java/com/ccsens/tall/service/ExcelService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 40e5c2ba..fb87af12 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -202,6 +202,7 @@ 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); From 458d770757e1e34a1c2f6eeb51aef35442e1b8b6 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 27 Apr 2021 10:18:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E6=A1=A3=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=A4=87=E6=B3=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tall/src/main/java/com/ccsens/tall/service/InputDocService.java | 1 + .../main/java/com/ccsens/tall/service/TaskDeliverService.java | 1 + 2 files changed, 2 insertions(+) diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index 23b17604..5007766e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -347,6 +347,7 @@ public class InputDocService implements IInputDocService { }else { //没有文件 操作类型为添加备注 historyRecord.setDoType((byte)5); + historyRecord.setHistoryRemark(param.getRemark()); } historyRecord.setMemberId(proMember.getId()); deliverHistoryRecordDao.insertSelective(historyRecord); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index fd1b7ff2..13678dcd 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -282,6 +282,7 @@ public class TaskDeliverService implements ITaskDeliverService { historyRecord.setDoType((byte)0); }else { historyRecord.setDoType((byte)5); + historyRecord.setHistoryRemark(uploadDeliver.getDescription()); } historyRecord.setMemberId(proMember.getId()); From 1b96b9f6d1742b99daf6639b973c2863912cb0cc Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 27 Apr 2021 11:35:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tall/service/ProTaskDetailService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 266e61a9..ebd289e6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -441,7 +441,13 @@ public class ProTaskDetailService implements IProTaskDetailService { Long checkerRole = normalTask.getCheckerRole(); ProRole checker = proRoleDao.selectByPrimaryKey(checkerRole); if(ObjectUtil.isNotNull(checker)) { - normalTask.setExecutorRoleName(checker.getName()); + normalTask.setCheckerRoleName(checker.getName()); + }else{ + //根据任务id查询项目下项目经理 + Long pmId = taskDetailDao.selectPmByTaskId(normalTask.getDetailId()); + ProRole proRole = proRoleDao.selectByPrimaryKey(pmId); + normalTask.setCheckerRole(proRole.getId()); + normalTask.setCheckerRoleName(proRole.getName()); }