From 1c89a9d39893c18aac63aa5763b4787b65de3624 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 30 五月 2024 11:28:37 +0800
Subject: [PATCH] fix:在线练习排序

---
 src/main/resources/mapper/ExamTemplatesUserCountMapper.xml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/ExamTemplatesUserCountMapper.xml b/src/main/resources/mapper/ExamTemplatesUserCountMapper.xml
index a65f399..569a336 100644
--- a/src/main/resources/mapper/ExamTemplatesUserCountMapper.xml
+++ b/src/main/resources/mapper/ExamTemplatesUserCountMapper.xml
@@ -19,15 +19,18 @@
     </insert>
 
     <select id="list" resultType="com.mindskip.xzs.domain.vo.ExamTemplatesUserCountVO" parameterType="com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM">
-        SELECT u.exam_templates_id as id, count(*) as count, u.user_id as userId FROM `t_exam_templates_user_count` u
-        left join t_exam_templates e on u.exam_templates_id = e.id
+        SELECT
+               e.id as id,
+               count(u.user_id) as count,
+               u.user_id as userId
+        FROM
+            t_exam_templates e
+                left join `t_exam_templates_user_count` u on u.exam_templates_id = e.id <if test="userId != null">and u.user_id = #{userId}</if>
         <where>
                 <if test="templatesId != null">
                     and u.exam_templates_id = #{templatesId}
                 </if>
-                <if test="userId != null">
-                    and u.user_id = #{userId}
-                </if>
+
                 <if test="status != null">
                     and e.status = 0
                 </if>
@@ -62,7 +65,8 @@
     </select>
 
     <select id="getCountByUserIdAndTemplatesId" resultType="java.lang.Integer" parameterType="com.mindskip.xzs.domain.vo.ExamTemplatesUserCountVO">
-        select count(*) from t_exam_templates_user_count
+        select count(*) from t_exam_templates_user_count a
+         inner join t_exam_paper_answer b on a.exam_paper_id = b.exam_paper_id and (b.invalid = 0 or b.invalid is null)
         where user_id = #{userId}  and exam_templates_id = #{id}
     </select>
 
@@ -93,4 +97,4 @@
         where c.templates_id = #{id}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.8.0