fix 合并

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password:  zhongzheng2021
             # 从库数据源

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

@@ -285,11 +285,13 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         //将该班级下的学员作弊的节改成待重修
         List<GoodsPeriodStatusVo> goodsPeriodStatusVos = baseMapper.listSection(bo);
         for (GoodsPeriodStatusVo goodsPeriodStatusVo : goodsPeriodStatusVos) {
+            //作弊都改为过往状态
             UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
             userPeriodStatus.setId(goodsPeriodStatusVo.getId());
             userPeriodStatus.setPeriodStatus(0);
             userPeriodStatus.setUpdateTime(DateUtils.getNowTime());
             userPeriodStatusService.updateById(userPeriodStatus);
+            //新增待重修数据
             UserPeriodStatusAddBo userPeriodStatusAddBo = new UserPeriodStatusAddBo();
             userPeriodStatusAddBo.setPeriodStatus(1);
             userPeriodStatusAddBo.setPeriodId(goodsPeriodStatusVo.getPeriodId());

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

@@ -373,8 +373,8 @@
             g.goods_name,
             g.`year`,
             cgu.period_status,
-            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1  and (ups.`status` =3 or ups.`status` =0) and up.grade_id = cgu.grade_id) as rebuild,
-            (case WHEN (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) >0 then 0 ELSE 1 end) as rebuild_status,
+            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where  ups.period_status =1  and (ups.`status` =3 or ups.`status` =0) and up.grade_id = cgu.grade_id and up.user_id = cgu.user_id) as rebuild,
+            (case WHEN (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.grade_id = cgu.grade_id AND ups.period_status =1 and ups.`status` =3 and up.user_id = cgu.user_id ) >0 then 1 ELSE 0 end) as rebuild_status,
             cgu.grade_id,
             IFNULL(ge.exam_num,0) exam_num,
             (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,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 and ubr.current_status = 1) as record_num,

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

@@ -206,8 +206,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listExamRecord" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="SectionStudyRecordVoResult">
         SELECT (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 cgu.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
-               (SELECT COUNT(DISTINCT ubr.chapter_id, 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=#{userId} and cgu.grade_id=cgg.grade_id and ubr.current_status=1 ) as exam_record_num
+               (SELECT COUNT(DISTINCT 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 cgu.grade_id=ubr.grade_id and ubr.current_status=1 ) as exam_record_num
         FROM
              class_grade_user cgu
         where 1=1

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

@@ -135,6 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="subscribeStatus != null and subscribeStatus != '' ">
             and us.subscribe_status = #{subscribeStatus}
         </if>
+        <if test="beforeStatus != null and beforeStatus != '' ">
+            and us.before_status = #{beforeStatus}
+        </if>
         <if test="applyId != null and applyId != '' ">
             and us.apply_id = #{applyId}
         </if>