he2802 3 سال پیش
والد
کامیت
14ad12af4e
1فایلهای تغییر یافته به همراه6 افزوده شده و 10 حذف شده
  1. 6 10
      zhongzheng-system/src/main/resources/mapper/modules/user/UserExamRecordMapper.xml

+ 6 - 10
zhongzheng-system/src/main/resources/mapper/modules/user/UserExamRecordMapper.xml

@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ue.chapter_exam_id as chapterExamId,NULL as courseId,NULL as moduleId,NULL as chapterId,NULL as sectionId,NULL
         as gradeId,
         ue.do_time,ue.exam_time,ue.total_score,ue.do_question_ids,ue.right_question_ids,ue.score,ue.all_question_num,ue.order_goods_id,
-        ue.less_question_num,ue.create_time,e.exam_name,ep.paper_name
+        ue.less_question_num,ue.create_time,e.exam_name,ep.paper_name,1 AS do_mode
         FROM
         (
         SELECT
@@ -142,8 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ue.exam_id,
         ue.module_exam_id,
         ue.chapter_exam_id,
-        MAX( UE.record_id ) record_id,
-        1 as do_mode
+        MAX( UE.record_id ) record_id
         FROM
         user_exam_record ue
         LEFT JOIN exam e ON ue.exam_id = e.exam_id
@@ -181,7 +180,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="chapterExamId != null and chapterExamId != ''">
             AND ue.chapter_exam_id = #{chapterExamId}</if>-- ORDER by ue.record_id DESC
         UNION ALL
-        SELECT * FROM (
         SELECT
         ue.record_id ,ue.user_id ,ue.exam_id ,1 AS courseType,null as type,ue.`status`,ue.goods_id
         ,ue.report_status,ue.performance,ue.history_exam_json,
@@ -189,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ue.chapter_exam_id as chapterExamId,NULL as courseId,NULL as moduleId,NULL as chapterId,NULL as sectionId,NULL
         as gradeId,
         ue.do_time,ue.exam_time,ue.total_score,ue.do_question_ids,ue.right_question_ids,ue.score,ue.all_question_num,ue.order_goods_id,
-        ue.less_question_num,ue.create_time,e.exam_name,ep.paper_name
+        ue.less_question_num,ue.create_time,e.exam_name,ep.paper_name,2 AS do_mode
         FROM
         (
         SELECT
@@ -197,8 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ue.exam_id,
         ue.module_exam_id,
         ue.chapter_exam_id,
-        MAX( UE.record_id ) record_id,
-        2 as do_mode
+        MAX( UE.record_id ) record_id
         FROM
         user_exam_record ue
         LEFT JOIN exam e ON ue.exam_id = e.exam_id
@@ -244,14 +241,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ue.course_id as courseId,ue.module_id as moduleId,ue.chapter_id as chapterId,ue.section_id as
         sectionId,ue.grade_id as gradeId,
         ue.do_time,ue.exam_time,ue.total_score,ue.do_question_ids,ue.right_question_ids,ue.score,ue.all_question_num,ue.order_goods_id,
-        ue.less_question_num,ue.create_time,e.exam_name,ep.paper_name
+        ue.less_question_num,ue.create_time,e.exam_name,ep.paper_name,1 AS do_mode
         FROM
         (
         SELECT
         ue.goods_id,
         ue.exam_id,
-        MAX( ue.record_id ) record_id,
-        1 as do_mode
+        MAX( ue.record_id ) record_id
         FROM
         user_bank_record ue
         LEFT JOIN exam e ON ue.exam_id = e.exam_id