20210419v1.1

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

@@ -988,17 +988,23 @@ public class ExcelService implements IExcelService {
                 }
 
                 //没有开始时间默认项目开始时间
-                if (StrUtil.isNotEmpty(beginTime)) {
-                    taskDetail.setBeginTime(Long.valueOf(beginTime));
-                } else {
-                    taskDetail.setBeginTime(sysProject.getBeginTime());
-                }
-                //没有结束时间默认项目结束时间
-                if (StrUtil.isNotEmpty(endTime)) {
-                    taskDetail.setEndTime(Long.valueOf(endTime));
-                } else {
-                    taskDetail.setEndTime(sysProject.getEndTime());
+                try {
+                    if (StrUtil.isNotEmpty(beginTime)) {
+                        taskDetail.setBeginTime(Long.valueOf(beginTime));
+                    } else {
+                        taskDetail.setBeginTime(sysProject.getBeginTime());
+                    }
+                    //没有结束时间默认项目结束时间
+                    if (StrUtil.isNotEmpty(endTime)) {
+                        taskDetail.setEndTime(Long.valueOf(endTime));
+                    } else {
+                        taskDetail.setEndTime(sysProject.getEndTime());
+                    }
+                }catch (Exception e){
+                    //日期格式错误
+                    throw new BaseException(CodeEnum.WBS_PROJECT_TIME_ERROR.addMsg(wbsSheet.getSheetName(),i + 1));
                 }
+
                 //重复频率
                 if (StrUtil.isNotEmpty(repeat)) {
                     taskDetail.setCycle(repeat);
@@ -1320,10 +1326,11 @@ public class ExcelService implements IExcelService {
                                     taskId = proTask.getId();
                                     break;
                                 }
-                            }else {
-                                throw new BaseException(CodeEnum.NOT_TASK.addMsg(sheet.getSheetName(),(i+1),task));
                             }
                         }
+                        if(taskId == null){
+                            throw new BaseException(CodeEnum.NOT_TASK.addMsg(sheet.getSheetName(),(i+1),task));
+                        }
                     }
 
                     for (int a = 2; a < roleRow.getLastCellNum(); a++) {

tall/src/main/resources/application.yml

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