fix 时间错误

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -674,7 +674,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 endTime = split[1];
                /* startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
-
+                if(Validator.isEmpty(startTime)||Validator.isEmpty(endTime)){
+                    userSubscribeImport.setCause("考试时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                if(startTime.length()!=5||endTime.length()!=5){
+                    userSubscribeImport.setCause("考试时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
                 userSubscribeAddBo.setApplySiteStartTime(startTime);
                 userSubscribeAddBo.setApplySiteEndTime(endTime);
             } else {
@@ -807,12 +816,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-            Long subscribeId = baseMapper.selectAddSubscribeId(applyId, goodsId, userId);
-            if (subscribeId != null) {
-                userSubscribeImport.setCause("该学员在考试计划中有预约考试数据，请确认该学员预约考试状况");
-                userSubscribeImports.add(userSubscribeImport);
-                continue;
-            }
+
 
            /* if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
                 if (userSubscribeImport.getStudentTypeName().equals("非补考学员")) {
@@ -871,9 +875,18 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
                  startTime = split[0];
                  endTime = split[1];
+                if(Validator.isEmpty(startTime)||Validator.isEmpty(endTime)){
+                    userSubscribeImport.setCause("考试时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                if(startTime.length()!=5||endTime.length()!=5){
+                    userSubscribeImport.setCause("考试时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
                /* startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
-
                 userSubscribeAddBo.setApplySiteStartTime(startTime);
                 userSubscribeAddBo.setApplySiteEndTime(endTime);
             } else {
@@ -894,6 +907,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
 
+
             if (StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())|| Validator.isEmpty(userSubscribeImport.getApplySiteExamTrainTime())|| Validator.isEmpty(userSubscribeImport.getApplySiteTime())) {
                 userSubscribeImport.setCause("考培数据错误");
                 userSubscribeImports.add(userSubscribeImport);
@@ -936,6 +950,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
                  startTrainTime = split[0];
                  endTrainTime = split[1];
+                if(Validator.isEmpty(startTrainTime)||Validator.isEmpty(endTrainTime)){
+                    userSubscribeImport.setCause("考培时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+                if(startTrainTime.length()!=5||endTrainTime.length()!=5){
+                    userSubscribeImport.setCause("考培时间段错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
               /*  startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
 
@@ -947,6 +971,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
+
+
             ExamApplyQueryBo queryTimeTrainBo = new ExamApplyQueryBo();
             queryTimeTrainBo.setApplySiteId(applySiteId);
             queryTimeTrainBo.setStartTime(startTrainTime);
@@ -958,6 +984,18 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+            if(userSubscribeAddBo.getApplySiteExamTrainTime().longValue()>=userSubscribeAddBo.getApplySiteExamTime().longValue()){
+                userSubscribeImport.setCause("该考培时间段需早于考试时间");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+            Long subscribeId = baseMapper.selectAddSubscribeId(applyId, goodsId, userId);
+            if (subscribeId != null) {
+                userSubscribeImport.setCause("该学员在考试计划中有预约考试数据，请确认该学员预约考试状况");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
 
 
             String importNo = ServletUtils.getEncoded("IMPORT");