fix 转状态

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -852,8 +852,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }*/
             classPeriodStudentVo.setAllStatus(changePeriodStatus(classPeriodStudentVo.getPeriodStatus()));
 
-
-
             //更新班级学时状态l
             /*if(!gradePeriodStatus.equals(classPeriodStudentVo.getPeriodStatus())){
                 LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
@@ -1168,7 +1166,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     //        classPeriodUserVo.setPending(classPeriodUserVo.getSecAllNum()-classPeriodUserVo.getPass()-classPeriodUserVo.getCheat());
     //        classPeriodUserVo.setExamPending(classPeriodUserVo.getExamNum()-classPeriodUserVo.getExamPass()-classPeriodUserVo.getExamCheat());
                 //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
-            if (classPeriodUserVo.getStuAllNum().equals(classPeriodUserVo.getSecAllNum()) && classPeriodUserVo.getExamNum().equals(classPeriodUserVo.getRecordNum())){
+           /* if (classPeriodUserVo.getStuAllNum().equals(classPeriodUserVo.getSecAllNum()) && classPeriodUserVo.getExamNum().equals(classPeriodUserVo.getRecordNum())){
                 if (classPeriodUserVo.getPending() != 0 || classPeriodUserVo.getExamPending() != 0){
                     classPeriodUserVo.setAllStatus(0);
                 }else if (classPeriodUserVo.getCheat() != 0 || classPeriodUserVo.getExamCheat() != 0){
@@ -1178,7 +1176,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
             }else {
                 classPeriodUserVo.setAllStatus(-1);
-            }
+            }*/
+            classPeriodUserVo.setAllStatus(changePeriodStatus(new Long(classPeriodUserVo.getPeriodStatus())));
         }
         return classPeriodUserVos;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodUserVo.java

@@ -115,4 +115,7 @@ public class ClassPeriodUserVo {
 
 	@ApiModelProperty("审核资料")
 	private String keyValue;
+
+	@ApiModelProperty("学时状态")
+	private Integer periodStatus;
 }

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

@@ -217,6 +217,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         if (System.currentTimeMillis()/1000 > time){
             throw new CustomException("当前选择的考试时间已过期，请重新预约，选择未过期考试时间");
         }
+        //要求非必填考点
         if(Validator.isNotEmpty(bo.getApplySiteAddress())){
             ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
             queryTimeBo.setApplyId(bo.getApplyId());

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -116,6 +116,7 @@
         <result property="examPending" column="exam_pending"/>
         <result property="examCheat" column="exam_cheat"/>
         <result property="keyValue" column="key_value"/>
+        <result property="periodStatus" column="period_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodVo" id="ClassPeriodVo">
@@ -420,6 +421,7 @@
         u.one_inch_photos,
         u.id_card_img1,
         u.id_card_img2,
+        cgu.period_status,
         (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN
         class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id, ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.report_status =1 and ubr.user_id=#{userId} and ubr.grade_id=cgu.grade_id and ubr.current_status=1) as record_num,