fix 合并

run-pre.sh

@@ -69,10 +69,8 @@ docker run \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
-
 -v /usr/share/fonts:/usr/share/fonts \
 -v /mydata-pre/app/${app_admin_name}/logs:/var/logs \
-
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
 

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

@@ -788,10 +788,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
             int num = findPeopleNum(queryTimeBo,siteTimeJson);
-            System.out.println(startTime);
-            System.out.println(endTime);
-            System.out.println(num);
-            System.out.println(sitePeopleNum);
             if(num==-1||num<=sitePeopleNum){
                 userSubscribeImport.setCause("考点人数已满");
                 userSubscribeImports.add(userSubscribeImport);
@@ -805,8 +801,10 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             Integer countHaveSubscribeNext = examApplyMapper.countHaveSubscribeNext(applyQueryBo);
             if(countHaveSubscribeNext<1){
                 userSubscribeImport.setStudentTypeName("非补考学员");
+                userSubscribeAddBo.setStudentType(1);
             }else{
                 userSubscribeImport.setStudentTypeName("补考学员");
+                userSubscribeAddBo.setStudentType(2);
             }
 
             String importNo = ServletUtils.getEncoded("IMPORT");
@@ -1124,8 +1122,10 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             Integer countHaveSubscribeNext = examApplyMapper.countHaveSubscribeNext(applyQueryBo);
             if(countHaveSubscribeNext<1){
                 userSubscribeImport.setStudentTypeName("非补考学员");
+                userSubscribeAddBo.setStudentType(1);
             }else{
                 userSubscribeImport.setStudentTypeName("补考学员");
+                userSubscribeAddBo.setStudentType(2);
             }
 
             String importNo = ServletUtils.getEncoded("IMPORT");