20210415v1.7

tall/src/main/java/com/ccsens/tall/bean/dto/MemberDto.java

@@ -16,12 +16,13 @@ public class MemberDto {
     @Data
     @ApiModel("添加成员")
     public static class SaveMember{
-        @NotNull
+        @NotNull(message = "项目id不能为空")
         @ApiModelProperty("项目id")
         private Long projectId;
+        @NotEmpty(message = "成员名不能为空")
         @ApiModelProperty("成员名")
         private String memberName;
-        @NotEmpty
+        @NotEmpty(message = "成员手机号不能为空")
         @ApiModelProperty("成员手机号")
         private String phone;
         @ApiModelProperty("所属角色的id")

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

@@ -528,7 +528,7 @@ public class ExcelService implements IExcelService {
                 if (StrUtil.isNotEmpty(memberCell) && StrUtil.isEmpty(phoneCell)) {
                     throw new BaseException(CodeEnum.WBS_NOT_PHONE.addMsg(memberSheet.getSheetName(), (i+1),memberCell));
                 }
-                //TODO 判断手机号格式
+                //判断手机号格式
                 String regex ="^[1]([3-9])[0-9]{9}$";
                 if (StrUtil.isEmpty(phoneCell) || !phoneCell.matches(regex)){
                     throw new BaseException(CodeEnum.WBS_PHONE_ERROR.addMsg(memberSheet.getSheetName(),(i+1),memberCell));
@@ -958,9 +958,8 @@ public class ExcelService implements IExcelService {
                 if (StrUtil.isNotEmpty(delayTime)) {
                     taskDetail.setDelayTime(DateUtil.str2MillSeconds(delayTime));
                 }
-                //TODO 跳转任务(应该在循环外处理
 
-                //输入文档    新的
+                //输入文档
                 if(StrUtil.isNotEmpty(inputFiles)){
                     String regex="，|,|；|;|、|/";
                     String[] fileNames= inputFiles.split(regex);
@@ -969,8 +968,6 @@ public class ExcelService implements IExcelService {
                     }
                 }
 
-                //TODO 设备挂载暂不处理
-
                 //没有开始时间默认项目开始时间
                 if (StrUtil.isNotEmpty(beginTime)) {
                     taskDetail.setBeginTime(Long.valueOf(beginTime));
@@ -1120,7 +1117,6 @@ public class ExcelService implements IExcelService {
             //添加周报
             saveMeetingTask("周报", "每周一", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId(),
                     "/home/report?type=\"week\"");
-            // TODO 添加季报
             //添加月报
             saveMeetingTask("月报", "每月1号", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId(),
                     "/home/report?type=\"month\"");

tall/src/main/java/com/ccsens/tall/service/ProMemberService.java

@@ -136,11 +136,11 @@ public class ProMemberService implements IProMemberService {
     }
 
 
-
     @Override
     public MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId) {
         return proMemberDao.selectByProjectIdAndUserId(projectId, currentUserId);
     }
+
     @Override
     public List<MemberVo.MemberInfo> getAuthedMemberByProjectId(Long projectId) {
         return proMemberDao.selectAuthedMemberByProjectId(projectId);
@@ -192,6 +192,7 @@ public class ProMemberService implements IProMemberService {
 
     /**
      * 查询用户在项目中的成员信息
+     *
      * @param userId    用户id
      * @param projectId 项目id
      * @return 返回成员信息
@@ -211,6 +212,7 @@ public class ProMemberService implements IProMemberService {
 
     /**
      * 游戏中查询用户的信息
+     *
      * @param userId 用户id
      * @return 返回成员信息
      */
@@ -271,6 +273,7 @@ public class ProMemberService implements IProMemberService {
 
             //获取奖惩干系人
             Long stakeholderId = null;
+            if (StrUtil.isNotEmpty(saveMember.getStakeholderName())){
                 if (StrUtil.isNotEmpty(saveMember.getStakeholderPhone())) {
                     ProMemberExample stakeholderExample = new ProMemberExample();
                     stakeholderExample.createCriteria().andProjectIdEqualTo(saveMember.getProjectId()).andPhoneEqualTo(saveMember.getStakeholderPhone());
@@ -303,6 +306,9 @@ public class ProMemberService implements IProMemberService {
                             proMemberRoleDao.insertSelective(proMemberRole);
                         }
                     }
+                }else {
+                    throw new BaseException(CodeEnum.WBS_NOT_PHONE.addMsg(saveMember.getStakeholderName()));
+                }
             }
             proMember.setStakeholderId(stakeholderId);
             proMemberDao.insertSelective(proMember);

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -459,6 +459,11 @@ public class ProRoleService implements IProRoleService {
     @Override
     public void deleteRole(Long userId, Long roleId) {
         ProRole role = proRoleDao.selectByPrimaryKey(roleId);
+        //TODO 项目经理不能被删除
+        Integer i = proRoleDao.isPmByRoleId(roleId);
+        if(i == 1){
+            throw new BaseException(CodeEnum.CANNOT_DELETE_PM);
+        }
 //        //本用户在项目中的角色
 //        List<ProRole> proRoles = getProRoleByProjectIdAndUserId(role.getProjectId(), userId);
         //用户在项目中的最高权限

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

@@ -206,6 +206,7 @@ public enum  CodeEnum {
     NOT_SUPPORT_CYCLE(168,"重复规则文本格式暂不支持",true),
     WBS_TASK_START_TIME_ERROR(168,"任务开始时间格式错误,请检查后操作",true),
     WBS_TASK_END_TIME_ERROR(169,"任务结束时间格式错误,请检查后操作",true),
+    CANNOT_DELETE_PM(170,"无法删除项目经理",true),
     ;