fix

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

@@ -251,4 +251,11 @@ public class GoodsUserVo {
 	/** 学习进度 */
 	@ApiModelProperty("0无刷题 1有刷题")
 	private Long beforeStatus;
+
+	/** 学习进度 */
+	@ApiModelProperty("考试标题")
+	private String applyName;
+
+	@ApiModelProperty("前培名字")
+	private String beforeName;
 }

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

@@ -128,8 +128,13 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
 
     private void userPeriodSave(UserStudyRecord entity,UserStudyRecordAddBo bo){
+        //记录学时审核
+        // 第一次学习加一条学时审核记录
+        //第二次学习验证是否审核，是否作弊，是否重修，待审核未完整播放
+        //记录照片
         UserStudyRecordPhotoAddBo userStudyRecordPhotoAddBo = new UserStudyRecordPhotoAddBo();
         userStudyRecordPhotoAddBo.setPhoto(bo.getPhoto());
+        userStudyRecordPhotoAddBo.setRecordId(entity.getRecordId());
         userStudyRecordPhotoService.insertByAddBo(userStudyRecordPhotoAddBo);
     }
 

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

@@ -158,6 +158,8 @@
         <result property="makeGoodsCode" column="make_goods_code"/>
         <result property="applyStatus" column="apply_status"/>
         <result property="beforeStatus" column="before_status"/>
+        <result property="applyName" column="apply_name"/>
+        <result property="beforeName" column="before_name"/>
     </resultMap>
 
 
@@ -386,6 +388,8 @@
                cgu.user_id,
         (case WHEN (SELECT COUNT(1) FROM exam_apply_goods eag LEFT JOIN exam_apply ea on eag.apply_id = ea.apply_id where eag.goods_id = cgg.goods_id and ea.`status` = 1 and unix_timestamp(now()) BETWEEN ea.apply_start_time and ea.apply_end_time) >0 then 1 ELSE 0 end) as apply_status,
         (case WHEN (SELECT COUNT(1) FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = cgg.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) >0 then 1 ELSE 0 end) as before_status
+        (SELECT ea.apply_name FROM exam_apply_goods eag LEFT JOIN exam_apply ea on eag.apply_id = ea.apply_id where eag.goods_id = cgg.goods_id and ea.`status` = 1 and unix_timestamp(now()) BETWEEN ea.apply_start_time and ea.apply_end_time) as apply_name,
+        (SELECT eb.before_name FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = cgg.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) as before_name
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamBeforeMapper.xml

@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	AND eb.`status` =1
     </select>
 
-    <select id="verifyInfo" parameterType="long" resultType="integer">
+    <select id="verifyInfo" parameterType="long" resultType="Long">
         SELECT
             COUNT(1)
         FROM