From a19399db7116288fec897996e5c9cf916407a606 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Wed, 14 Apr 2021 18:37:35 +0800
Subject: [PATCH] 0414

---
 .../com/ccsens/tall/service/ExcelService.java | 19 +++++++++++++++----
 .../main/java/com/ccsens/util/CodeEnum.java   |  5 ++++-
 2 files changed, 19 insertions(+), 5 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 2e41c6c8..46487c82 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
@@ -425,7 +425,7 @@ public class ExcelService implements IExcelService {
            throw new BaseException(CodeEnum.NOT_FOUND_PM);
         }
         if (!allOneRole.toString().contains(WebConstant.ROLE_NAME.Member.value)){
-            throw new BaseException(CodeEnum.NOT_FOUND_Member);
+            throw new BaseException(CodeEnum.NOT_FOUND_MEMBER);
         }
         //角色对谁不可见
         String[] excludeRoleCells;
@@ -526,7 +526,10 @@ public class ExcelService implements IExcelService {
                     throw new BaseException(CodeEnum.WBS_NOT_PHONE.addMsg(memberSheet.getSheetName(), (i+1),memberCell));
                 }
                 //TODO 判断手机号格式
-
+                String regex ="^[1]([3-9])[0-9]{9}$";
+                if (!phoneCell.matches(regex)){
+                    throw new BaseException(CodeEnum.WBS_PHONE_ERROR.addMsg(memberSheet.getSheetName() + (i+1)));
+                }
                 //添加奖惩干系人
                 if (StrUtil.isNotEmpty(stakeholderCell)) {
                     if (!stakeholderWithPhone(stakeholderList, stakeholderCell, stakeholderPhoneCell)) {
@@ -829,7 +832,11 @@ public class ExcelService implements IExcelService {
 //                    firstTaskDetail.setBeginTime(firstStartTime);
 //                }else{
                     if (StrUtil.isNotEmpty(beginTime)) {
-                        firstTaskDetail.setBeginTime(Long.valueOf(beginTime));
+                        try{
+                            firstTaskDetail.setBeginTime(Long.valueOf(beginTime));
+                        }catch (Exception e){
+                            throw new BaseException(CodeEnum.WBS_TASK_START_TIME_ERROR.addMsg(wbsSheet.getSheetName() + (i+1)));
+                        }
                     }else {
                         firstTaskDetail.setBeginTime(sysProject.getBeginTime());
                     }
@@ -852,7 +859,11 @@ public class ExcelService implements IExcelService {
                 if(CollectionUtil.isNotEmpty(taskDetails)){
                     for(ProTaskDetail taskDetail : taskDetails){
                         if(taskDetail.getId().longValue() == firstTaskDetailId){
-                            taskDetail.setEndTime(Long.valueOf(endTime));
+                            try {
+                                taskDetail.setEndTime(Long.valueOf(endTime));
+                            }catch (Exception e){
+                                throw new BaseException(CodeEnum.WBS_TASK_END_TIME_ERROR.addMsg(wbsSheet.getSheetName() + (i+1)));
+                            }
                             taskDetailDao.updateByPrimaryKeySelective(taskDetail);
                             firstStartTime = taskDetail.getEndTime();
                             break;
diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java
index 25c19994..828fc4ef 100644
--- a/util/src/main/java/com/ccsens/util/CodeEnum.java
+++ b/util/src/main/java/com/ccsens/util/CodeEnum.java
@@ -32,6 +32,7 @@ public enum  CodeEnum {
     WBS_NOT_PROJECT(17,"找不到项目信息",true),
     WBS_NOT_MEMBER_SHEET(18,"未找到项目成员表",true),
     WBS_NOT_PHONE(19,"手机号为空",true),
+    WBS_PHONE_ERROR(19,"手机号格式错误",true),
     WBS_STAKEHOLDER_PHONE(20,"奖惩干系人和手机号不匹配",true),
     WBS_REPEAT_MEMBER_PHONE(21,"成员已存在",true),
     WBS_NOT_FIRST_ROLE(22,"系统角色名称错误",true),
@@ -201,8 +202,10 @@ public enum  CodeEnum {
     ZUISHAOCHUANLIANGE(164,"排序最少需要传入两个",true),
     HOSPITAL_NOT_FOUND(165,"没有找到医院",true),
     NOT_FOUND_PM(166,"系统角色缺少项目经理",true),
-    NOT_FOUND_Member(167,"系统角色缺少项目成员",true),
+    NOT_FOUND_MEMBER(167,"系统角色缺少项目成员",true),
     NOT_SUPPORT_CYCLE(168,"重复规则文本格式暂不支持",true),
+    WBS_TASK_START_TIME_ERROR(168,"任务开始时间格式错误,请检查后操作",true),
+    WBS_TASK_END_TIME_ERROR(169,"任务结束时间格式错误,请检查后操作",true),
     ;