Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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);
@@ -202,6 +203,14 @@ 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));
             if (StrUtil.isNotEmpty(begin) && StrUtil.isNotEmpty(end)) {

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);

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());
                 }
 
 

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());

tall/src/main/resources/application.yml

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

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),
+
     ;