fix 业务层次

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CoursePhotoLogAddBo.java

@@ -51,4 +51,13 @@ public class CoursePhotoLogAddBo {
     /** 班级ID */
     @ApiModelProperty("班级ID")
     private Long gradeId;
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+    /** 当前状态 1 当前状态 0过往状态 */
+    @ApiModelProperty("当前状态 1 当前状态 0过往状态")
+    private Integer currentStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CoursePhotoLogEditBo.java

@@ -58,4 +58,13 @@ public class CoursePhotoLogEditBo {
     /** 班级ID */
     @ApiModelProperty("班级ID")
     private Long gradeId;
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+    /** 当前状态 1 当前状态 0过往状态 */
+    @ApiModelProperty("当前状态 1 当前状态 0过往状态")
+    private Integer currentStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CoursePhotoLog.java

@@ -50,4 +50,10 @@ private static final long serialVersionUID=1L;
     private Long gradeId;
     /** 商品ID */
     private Long goodsId;
+    /** 模块ID */
+    private Long moduleId;
+    /** 章ID */
+    private Long chapterId;
+    /** 当前状态 1 当前状态 0过往状态 */
+    private Integer currentStatus;
 }

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

@@ -606,9 +606,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
         classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
+        classPeriodSectionVo.setAuditUserName(userPeriodStatusVo.getAuditUserName());
         //判断是节还是试卷
         if (bo.getSectionId() != null) {
             classPeriodSectionVo.setId(bo.getSectionId());
+            classPeriodSectionVo.setDurationTime(userPeriodStatusVo.getDurationTime());
             classPeriodSectionVo.setType(3L);
         }else {
             classPeriodSectionVo.setId(bo.getExamId());

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.grade.domain.UserPeriod;
@@ -167,7 +168,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
     private void updateExam(UserBankRecord add) {
         //试卷及格绑定成绩和记录做题，待审，通过不记录
         UserBankRecordVo userBankRecordVo = this.queryById(add.getRecordId());
-        if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && add.getReportStatus().equals(1)){
+        if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && Validator.isNotEmpty(add.getReportStatus())&& add.getReportStatus().equals(1)){
             //增加一条审核记录
             UserPeriod userPeriod = new UserPeriod();
             userPeriod.setUserId(userBankRecordVo.getUserId());
@@ -202,28 +203,23 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
             userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
         }
 
+        //待重修
         if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
-            //修改之前的记录，新增一条当前记录
+            //将待重修改为待审核
             UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
-            userPeriodStatus.setPeriodStatus(0);
+            userPeriodStatus.setStatus(2);
+            userPeriodStatus.setRecordStartTime(userBankRecordVo.getCreateTime());
+            userPeriodStatus.setRecordEndTime(userBankRecordVo.getUpdateTime());
+            userPeriodStatus.setPerformance(userBankRecordVo.getPerformance());
             iUserPeriodStatusService.updateById(userPeriodStatus);
-            UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
-            userPeriodStatusAddBo.setPeriodStatus(1);
-            userPeriodStatusAddBo.setStatus(2);
-            userPeriodStatusAddBo.setRecordStartTime(userBankRecordVo.getCreateTime());
-            userPeriodStatusAddBo.setRecordEndTime(userBankRecordVo.getUpdateTime());
-            userPeriodStatusAddBo.setPeriodId(userPeriodStatus.getPeriodId());
-            userPeriodStatusAddBo.setCreateTime(DateUtils.getNowTime());
-            userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
-            userPeriodStatusAddBo.setPerformance(userBankRecordVo.getPerformance());
-            iUserPeriodStatusService.save(userPeriodStatusAddBo);
+
             //将照片绑定学时
             LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
             lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
             lqw.eq(UserStudyRecordPhoto::getStatus, 2);
             lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
             UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
-            userStudyRecordPhoto.setPeriodId(userPeriodStatusAddBo.getId());
+            userStudyRecordPhoto.setPeriodId(userPeriodStatus.getId());
             userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
             userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
         }

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

@@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="photoIndex" column="photo_index"/>
         <result property="gradeId" column="grade_id"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="currentStatus" column="current_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CoursePhotoLogVo" id="CoursePhotoLogVoResult">
@@ -30,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="photoIndex" column="photo_index"/>
         <result property="gradeId" column="grade_id"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="currentStatus" column="current_status"/>
     </resultMap>
 
     <select id="getLastInfo" parameterType="com.zhongzheng.modules.course.bo.CoursePhotoLogQueryBo"  resultMap="CoursePhotoLogVoResult">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -330,21 +330,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                        FROM
                                            question_chapter_exam
                                        WHERE
-                                               chapter_exam_id IN (
-                                               SELECT
-                                                   concat(
-                                                           IFNULL(( SELECT GROUP_CONCAT(  major_id ) eids FROM goods_attached WHERE goods_id = #{goodsId} AND type = 2 ), '' ),
-                                                           ',',
-                                                           IFNULL(
-                                                                   (
-                                                                       SELECT
-                                                                           GROUP_CONCAT(  chapter_exam_id ) eids2
-                                                                       FROM
-                                                                           question_module_chapter
-                                                                       WHERE
-                                                                               module_exam_id IN ( SELECT major_id FROM goods_attached WHERE goods_id = #{goodsId} AND type = 1 )),
-                                                                   ''
-                                                               )))),
+                                           FIND_IN_SET(chapter_exam_id,
+                                                       (SELECT
+                                                            concat(
+                                                                    IFNULL(( SELECT GROUP_CONCAT(  major_id ) eids FROM goods_attached WHERE goods_id = #{goodsId} AND type = 2 ), '' ),
+                                                                    ',',
+                                                                    IFNULL(
+                                                                            (
+                                                                                SELECT
+                                                                                    GROUP_CONCAT(  chapter_exam_id ) eids2
+                                                                                FROM
+                                                                                    question_module_chapter
+                                                                                WHERE
+                                                                                        module_exam_id IN ( SELECT major_id FROM goods_attached WHERE goods_id = #{goodsId} AND type = 1 )),
+                                                                            ''
+                                                                        ))))),
                                    ''
                                 ),
                             ',',

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -828,7 +828,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         1 =1
           and ups.period_status = 1
-          and ups.status in (0,3)
+          and ups.status = 3
         <choose>
             <when test="chapterId != null and chapterId !=''">
                 AND up.chapter_id = #{chapterId}