fix 合并

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

@@ -737,7 +737,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             String startTime = "";
             String endTime = "";
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
+                userSubscribeImport.setApplySiteTime(userSubscribeImport.getApplySiteTime().replace(" ", ""));
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
+
                 if (split.length < 2) {
                     userSubscribeImport.setCause("考试时间段错误");
                     userSubscribeImports.add(userSubscribeImport);
@@ -766,7 +768,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
             ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
-            queryTimeBo.setApplySiteId(applySiteId);
+            queryTimeBo.setApplyId(applyId);
             queryTimeBo.setStartTime(startTime);
             queryTimeBo.setEndTime(endTime);
             queryTimeBo.setExamTime(userSubscribeAddBo.getApplySiteExamTime());
@@ -785,8 +787,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-            int existNum = findPeopleNum(queryTimeBo,siteTimeJson);
-            if(existNum==-1||existNum>=sitePeopleNum){
+            int num = findPeopleNum(queryTimeBo,siteTimeJson);
+            if(num==-1||num<=sitePeopleNum){
                 userSubscribeImport.setCause("考点人数已满");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
@@ -966,6 +968,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             String startTime = "";
             String endTime = "";
             if (Validator.isNotEmpty(userSubscribeImport.getApplySiteTime())) {
+                userSubscribeImport.setApplySiteTime(userSubscribeImport.getApplySiteTime().replace(" ", ""));
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
                 if (split.length < 2) {
                     userSubscribeImport.setCause("考试时间段错误");
@@ -1013,8 +1016,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-            int existNum = findPeopleNum(queryTimeBo,siteTimeJson);
-            if(existNum==-1||existNum>=sitePeopleNum){
+            int num = findPeopleNum(queryTimeBo,siteTimeJson);
+            if(num==-1||num<=sitePeopleNum){
                 userSubscribeImport.setCause("考点人数已满");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
@@ -1323,6 +1326,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             String startTime = "";
             String endTime = "";
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
+                userSubscribeImport.setApplySiteTime(userSubscribeImport.getApplySiteTime().replace(" ", ""));
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
                 if (split.length < 2) {
                     userSubscribeImport.setCause("考试时间段错误");