搜索条件新增

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -226,6 +226,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             }else {
                 goodsPeriodVo.setPeriodStatus(-1L);
             }
+            if (goodsPeriodVo.getRebuildNum() > 0){
+                goodsPeriodVo.setPeriodStatus(-1L);
+            }
         }
         return goodsPeriodVos;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -205,7 +205,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
     @Override
     public Long subscribeNext(ExamApplyQueryBo bo) {
         Integer countHaveSubscribeNext = baseMapper.countHaveSubscribeNext(bo);
-        if (bo.getApplyStatus() == 1 && countHaveSubscribeNext > 0){
+        if (bo.getApplyStatus().equals(2) && countHaveSubscribeNext > 0){
             throw new IllegalArgumentException("系统检索到您不符合【非补考学员】的报名条件，请重新选择！");
         }
         //查询剩余考试次数

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPeriodVo.java

@@ -102,4 +102,7 @@ public class GoodsPeriodVo {
 
 	@ApiModelProperty("前培名字")
 	private String beforeName;
+
+	@ApiModelProperty("重修目录")
+	private Long rebuildNum;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -99,6 +99,7 @@
         <result property="beforeStatus" column="before_status"/>
         <result property="applyName" column="apply_name"/>
         <result property="beforeName" column="before_name"/>
+        <result property="rebuildNum" column="rebuildNum"/>
         <result property="rebuildStatus" column="rebuild_status"/>
     </resultMap>
 
@@ -338,6 +339,8 @@
             (SELECT COUNT(DISTINCT ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.report_status =1 and ubr.user_id =cgu.user_id and ubr.grade_id = cg.grade_id) as record_num,
             (SELECT COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where
                 ups.`status` =1 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1) as pass,
+            (SELECT COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where
+                ups.`status` =3 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1) as rebuildNum,
             (SELECT
                  COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where ups.`status`
                 =0 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1) as cheat,