he2802 vor 2 Jahren
Ursprung
Commit
563017362b

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

@@ -400,7 +400,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
         queryBo.setGradeId(bo.getGradeId());
         queryBo.setUserId(bo.getUserId());
-        ClassPeriodStudentVo classPeriodStudentVo = baseMapper.userPeriodStatus(queryBo);
+        ClassPeriodStudentVo classPeriodStudentVo = baseMapper.userPeriodStatus (queryBo);
         Long secLong = 0L;
         Long studyLong = 0L;
 

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

@@ -198,6 +198,7 @@
         <result property="studyEndTime" column="study_end_time"/>
         <result property="performance" column="performance"/>
         <result property="sort" column="sort"/>
+        <result property="moduleId" column="module_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodSectionVo" id="ClassPeriodSectionVo">
@@ -220,6 +221,8 @@
         <result property="realLiveEndTime" column="real_live_end_time"/>
         <result property="realDuration" column="real_duration"/>
         <result property="recordingUrl" column="recording_url"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="moduleId" column="module_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseChapterVo" id="CourseChapterResultVo">
@@ -1034,7 +1037,9 @@
         ) as user_id,
         (SELECT e.exam_name FROM exam e where cme.exam_id = e.exam_id) as type_name,
         null as class_hours,
-        4 as type
+        4 as type,
+        cme.module_id,
+        cme.chapter_id
         FROM
         course_menu_exam cme
         LEFT JOIN exam e ON cme.exam_id = e.exam_id
@@ -1067,7 +1072,8 @@
         ) as user_id,
         (SELECT e.exam_name FROM exam e where cme.exam_id = e.exam_id) as type_name,
         null as class_hours,
-        5 as type
+        5 as type,
+        cme.module_id
         FROM
         course_menu_exam cme
         LEFT JOIN exam e ON cme.exam_id = e.exam_id