From 2873f1cd6ea6caac062740e05994a1f0a880ffde Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 12 三月 2024 11:27:20 +0800
Subject: [PATCH] 一个用户只能是一个部门的管理员、创建随机试卷的时候人员只能选当前部门的人,试卷增加部门id

---
 src/main/resources/mapper/ExamPaperAnswerMapper.xml |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 5c57a63..48ef38f 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -274,17 +274,25 @@
 
   <select id="adminPage" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM t_exam_paper_answer
+    a.id, a.exam_paper_id, a.paper_name, a.paper_type, a.subject_id, a.system_score, a.user_score,
+    a.paper_score, a.question_correct, a.question_count, a.do_time, a.status, a.create_user, a.create_time,
+    a.task_exam_id, u.real_name as userName
+    FROM t_exam_paper_answer a
+    left join t_user u on a.create_user = u.id
     <where>
       <if test="subjectId != null">
-        and subject_id = #{subjectId}
+        and a.subject_id = #{subjectId}
       </if>
       <if test="paperName != null and paperName != ''">
-        and paper_name like concat('%',#{paperName},'%')
+        and a.paper_name like concat('%',#{paperName},'%')
+      </if>
+      <if test="userName != null and userName != ''">
+        and u.real_name like concat('%',#{userName},'%')
       </if>
     </where>
   </select>
+
+
   <select id="getById" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
@@ -356,4 +364,18 @@
     </if>
   </select>
 
+  <select id="getResult" resultMap="BaseResultMap" parameterType="list">
+    select * from t_exam_paper_answer  where (exam_paper_id) in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      (#{item})
+    </foreach>
+  </select>
+
+  <select id="getByTimeOne" resultType="com.mindskip.xzs.domain.vo.TeamplatesUserExcelVO">
+    select a.paper_name as name, u.real_name as userName,SUBSTRING_INDEX(a.user_score/10,".",1) as userScore,
+           SUBSTRING_INDEX(a.paper_score/10,".",1) as paperScore,a.do_time as doTime from t_exam_paper_answer a
+    left join t_user u on a.create_user = u.id
+    where a.create_time between '2023-11-28 09:00:00' and '2023-12-01 10:00:00'
+  </select>
+
 </mapper>

--
Gitblit v1.8.0