fix

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

@@ -1769,7 +1769,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 //查找开始学习时间
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId(),classPeriodStudentVo.getOrderGoodsId()).get(0));
             }else{
-                classPeriodStudentVo.setStartTime(baseMapper.selectStartNoPhoto(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId(),classPeriodStudentVo.getOrderGoodsId()));
+                classPeriodStudentVo.setStartTime(baseMapper.selectStartNoPhoto(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId(),classPeriodStudentVo.getOrderGoodsId())
+                );
             }
             //当审核状态状态为通过是采取解析身份证和一寸照
             if ("1".equals(classPeriodStudentVo.getProfileStatus()) && Validator.isNotEmpty(bo.getUserPhoto()) && bo.getUserPhoto() == 1) {

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

@@ -297,7 +297,7 @@
         LEFT JOIN major m ON c.major_id = m.id AND m.status =1
         LEFT JOIN course_subject cs ON cs.id = c.subject_id AND cs.status =1
         WHERE
-        1 = 1 AND c.status !=-1 AND c.course_show =1
+        1 = 1 AND c.status !=-1 AND c.course_show =1 AND c.first_choice =0
         <if test="subjectIds != null and subjectIds.size()!=0 ">
             AND c.subject_id in
             <foreach collection="subjectIds" item="item" index="index" open="(" close=")" separator=",">
@@ -348,7 +348,7 @@
         FROM
             course c
         WHERE
-        1 = 1   AND c.status !=-1 AND c.course_show =1
+        1 = 1   AND c.status !=-1 AND c.course_show =1 AND c.first_choice =0
         <if test="subjectIds != null and subjectIds.size()!=0 ">
             AND c.subject_id in
             <foreach collection="subjectIds" item="item" index="index" open="(" close=")" separator=",">

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

@@ -832,15 +832,14 @@
         cg.class_end_time,
         g.study_start_time,
         g.study_end_time,
-        (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.`type` in (1,3) and ubr.grade_id = cg.grade_id and ubr.order_goods_id = cgu.order_goods_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_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.`type` in (1,3) and ubr.grade_id = cg.grade_id and ubr.order_goods_id = cgu.order_goods_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num,
         cgu.user_id,
-        cgg.goods_id
+        og.goods_id
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id=cgg.grade_id
-        LEFT JOIN goods g on g.goods_id=cgg.goods_id
+        LEFT JOIN order_goods og on og.order_goods_id=cgu.order_goods_id
+        LEFT JOIN goods g on g.goods_id=og.goods_id
         LEFT JOIN (SELECT
         COUNT( m.id ) AS exam_num,
         c.goods_id
@@ -849,7 +848,7 @@
         LEFT JOIN goods_course c ON m.course_id = c.course_id
         where
         m.type in (1,3)
-        GROUP BY c.goods_id ) ge on cgg.goods_id = ge.goods_id
+        GROUP BY c.goods_id ) ge on og.goods_id = ge.goods_id
         where 1=1
         and cgu.`status` =1