From 54a6c048c97011cd2a99fbef2065afe0a167fcfc Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 22 七月 2024 13:46:05 +0800
Subject: [PATCH] fix：成绩统计导出完善
---
src/main/resources/mapper/ExamPaperMapper.xml | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index e558a7c..92cf7f6 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -451,26 +451,26 @@
<select id="list" resultType="com.mindskip.xzs.domain.ExamPaper">
- select id, name, paper_type, create_time from t_exam_paper
- where paper_type != 7
+ select tep.id, name, paper_type, create_time from t_exam_paper tep left join t_user_department tud on tep.create_user = tud.user_id
+ where paper_type != 7 and tep.deleted = 0
<if test="deptIds != null and deptIds.size() > 0">
- and dept_id in
- <foreach collection="deptIds" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ and (tep.create_user = 2
+ or tud.department_id in <foreach collection="deptIds" item="item" open="(" separator="," close=")"> #{item} </foreach>
+ )
</if>
- order by create_time desc
+ group by tep.id
+ order by tep.id desc
</select>
<select id="template" resultType="com.mindskip.xzs.domain.ExamPaper">
- select id, name, paper_type, ctime as create_time from t_exam_templates
+ select tet.id, name, paper_type, ctime as create_time from t_exam_templates tet left join t_user_department tud on tet.create_user = tud.user_id
<if test="deptIds != null and deptIds.size() > 0">
- where dept_id in
- <foreach collection="deptIds" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ where (tet.create_user = 2
+ or tud.department_id in <foreach collection="deptIds" item="item" open="(" separator="," close=")"> #{item} </foreach>
+ )
</if>
- order by ctime desc
+ group by tet.id
+ order by tet.id desc
</select>
<select id="selectStudent" resultType="com.mindskip.xzs.domain.vo.UserVO" parameterType="com.mindskip.xzs.domain.vo.UserVO">
@@ -511,7 +511,7 @@
</select>
<select id="getExamPaper" resultType="com.mindskip.xzs.domain.ExamPaper">
- select id, name, paper_type, create_time from t_exam_paper where paper_type != 7 order by create_time desc
+ select id, name, paper_type, create_time from t_exam_paper where paper_type != 7 and deleted = 0 order by create_time desc
</select>
<select id="getTemplate" resultType="com.mindskip.xzs.domain.ExamPaper">
--
Gitblit v1.8.0