|
@@ -117,6 +117,8 @@
|
|
|
<result property="examCheat" column="exam_cheat"/>
|
|
|
<result property="keyValue" column="key_value"/>
|
|
|
<result property="periodStatus" column="period_status"/>
|
|
|
+ <result property="studyStartTime" column="study_start_time"/>
|
|
|
+ <result property="studyEndTime" column="study_end_time"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodVo" id="ClassPeriodVo">
|
|
@@ -441,6 +443,10 @@
|
|
|
COUNT(DISTINCT up.course_id,up.module_id,up.chapter_id,up.section_id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where ups.`status`
|
|
|
=2 and ups.period_status = 1 and up.goods_id=#{goodsId} and up.grade_id = cg.grade_id and up.user_id = #{userId} and up.type = 2) as exam_pending,
|
|
|
(SELECT up.key_value FROM user_profile up where up.goods_id = #{goodsId} and up.user_id =#{userId} and up.current_status = 1 and up.type_status =1 LIMIT 1) as key_value
|
|
|
+ <if test="userId != null and userId !='' ">
|
|
|
+ ,(SELECT MIN(first_start_time) from user_study_record where user_id = #{userId} and grade_id = #{gradeId}) as study_start_time,
|
|
|
+ (SELECT MAX(end_time) from user_study_record where user_id = #{userId} and grade_id = #{gradeId}) as study_end_time
|
|
|
+ </if>
|
|
|
FROM
|
|
|
class_grade_user cgu
|
|
|
LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
|