fix 学习记录

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

@@ -337,6 +337,15 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if(gradePeriodStatus==2){
             classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
         }
+        if(gradePeriodStatus==1){
+            //判断结业
+            long nowTime = System.currentTimeMillis()/1000;
+            if(Validator.isNotEmpty(classPeriodStudentVo.getClassEndTime())&&Validator.isNotEmpty(classPeriodStudentVo.getClassStartTime())){
+                if(nowTime<classPeriodStudentVo.getClassEndTime()&&nowTime>classPeriodStudentVo.getClassStartTime()){
+                    classGradeUser1.setFinishStatus(1);
+                }
+            }
+        }
         classGradeUser1.setUpdateTime(DateUtils.getNowTime());
         iClassGradeUserService.update(classGradeUser1, classGradeUser);
         return null;

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

@@ -533,6 +533,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(goodsStudyRecordVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(goodsStudyRecordVo.getUserId());
+            subjectStudyRecordQueryBo.setGradeId(goodsStudyRecordVo.getGradeId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
 
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {

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

@@ -334,6 +334,10 @@
             resultMap="ClassPeriodStudentVo">
         SELECT
         IFNULL(ge.exam_num,0) as exam_num,
+        cg.class_start_time,
+        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.grade_id = cg.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num,
         cgu.user_id,
@@ -342,6 +346,7 @@
         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 (SELECT
         COUNT( m.id ) AS exam_num,
         c.goods_id

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

@@ -151,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN class_grade_goods d ON u.grade_id = d.grade_id
         LEFT JOIN goods g on g.goods_id = d.goods_id
         where 1=1
+        and u.change_grade = 0
         <if test="userId != null and userId !=''">
             and u.user_id = #{userId}
         </if>