From f33f56fb2ebfea915b93467698ca6b243ee934ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:32:49 +0800
Subject: [PATCH] 导出完善

---
 src/main/resources/mapper/ExamPaperMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 90f6c53..e558a7c 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -276,6 +276,9 @@
       <if test="type != null ">
         and e.type= #{type}
       </if>
+      <if test="name != null and name != ''">
+        AND INSTR(name, #{name})
+      </if>
     </where>
     group by e.id
   </select>
@@ -327,7 +330,7 @@
 
   <select id="indexPaper" resultMap="PaperInfoResultMap" parameterType="com.mindskip.xzs.viewmodel.student.dashboard.PaperFilter">
       select * from(
-      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time
+      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time,e.create_time
       FROM t_exam_paper e
       LEFT JOIN t_exam_paper_department d on d.exam_paper_id = e.id
       <where>
@@ -354,7 +357,7 @@
       ORDER BY e.id desc ) t
       union all
       select * from (
-      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time
+      SELECT e.id,e.name,e.limit_start_time,e.limit_end_time,e.create_time
       FROM t_exam_paper e
       LEFT JOIN t_exam_paper_user u on u.exam_paper_id = e.id
       <where>
@@ -438,6 +441,15 @@
     where a.exam_paper_id = #{id}
   </select>
 
+  <select id="getRandomPaperExcelById" resultType="com.mindskip.xzs.domain.vo.PaperExcelVO" parameterType="java.lang.Integer">
+    select u.real_name as name,a.create_user as userId,a.user_score as userScore,a.paper_score as paperScore
+    from t_exam_paper_answer a
+           inner join t_user u on u.id = a.create_user
+           inner join t_exam_templates_user_count uc ON a.exam_paper_id = uc.exam_paper_id AND uc.exam_templates_id = #{id}
+    where a.invalid = 0
+  </select>
+
+
     <select id="list" resultType="com.mindskip.xzs.domain.ExamPaper">
     select id, name, paper_type, create_time from t_exam_paper
     where paper_type != 7
@@ -488,7 +500,7 @@
         <if test="excludeTagIds != null and excludeTagIds.size > 0">
           <if test="tagIds != null and tagIds.size > 0">and</if>
           <foreach collection="excludeTagIds" open="(" separator="and" close=")" item="item">
-            not find_in_set(#{item}, group_concat(b.tag_id))
+            (NOT find_in_set(#{item}, group_concat(b.tag_id)) OR group_concat(b.tag_id) IS NULL)
           </foreach>
         </if>
       order by a.id

--
Gitblit v1.8.0