fix 学习记录

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -176,7 +176,7 @@ public class ClassGradeController extends BaseController {
         }
 
         startPage();
-
+        bo.setUserPhoto(1);
         List<ClassPeriodStudentExportVo> list = iClassGradeUserService.exportPo(bo);
         ExcelUtil<ClassPeriodStudentExportVo> util = new ExcelUtil<ClassPeriodStudentExportVo>(ClassPeriodStudentExportVo.class);
         ExportParams deptExportParams = new ExportParams();

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

@@ -243,10 +243,12 @@
         <if test="userPhoto != null and userPhoto == 1">
         up.key_value,
         </if>
-        (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.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num,
-        cgu.period_time as end_time,
+        cgu.period_time as end_time
+        <if test="userPhoto == null">
+        ,(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.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num,
       (select COUNT(up.id) from user_period up LEFT JOIN user_period_status ups on up.id=ups.period_id where up.goods_id = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) and up.grade_id = cgu.grade_id and up.user_id = u.user_id
         and ups.period_status=0 and ups.`status`=0 and (SELECT COUNT(upss.id) from user_period_status upss where upss.id = ups.id and upss.period_status = 1 and upss.`status` = 2) > 0 ) as rebuild_num
+        </if>
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
@@ -295,6 +297,12 @@
         <if test="periodStatus == 2 ">
             order by cgu.period_wait_time,cgu.update_time desc
         </if>
+        <if test="studyStatus != null and studyStatus == 1 ">
+            and cgu.period_status = -1
+        </if>
+        <if test="studyStatus != null and studyStatus == 2 ">
+            and cgu.period_status != -1
+        </if>
         <if test="periodStatus != 2 ">
             order by cgu.update_time desc
         </if>