From 33fdb033e0a6b5ef6b2f8ac5fc67ad8222e564e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 14:49:12 +0800
Subject: [PATCH] 下载文件接口，bug修改

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

diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 9a4c638..f24b711 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -21,7 +21,7 @@
     <result column="user_ids" jdbcType="VARCHAR" property="userIds" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, name, subject_id, paper_type, grade_level, score, question_count, suggest_time,
+    id, dept_id, name, subject_id, paper_type, grade_level, score, question_count, suggest_time,
     limit_start_time, limit_end_time, frame_text_content_id, create_user, create_time,
     deleted, task_exam_id, type, user_ids
   </sql>
@@ -55,6 +55,9 @@
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
+      </if>
+      <if test="deptId != null">
+        dept_id,
       </if>
       <if test="name != null">
         name,
@@ -108,6 +111,9 @@
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deptId != null">
+        #{deptId,jdbcType=INTEGER},
       </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
@@ -165,6 +171,9 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="deptId != null">
+        dept_id = #{deptId,jdbcType=INTEGER},
+      </if>
       <if test="subjectId != null">
         subject_id = #{subjectId,jdbcType=INTEGER},
       </if>
@@ -214,6 +223,7 @@
     update t_exam_paper
     set name = #{name,jdbcType=VARCHAR},
       subject_id = #{subjectId,jdbcType=INTEGER},
+      dept_id = #{deptId,jdbcType=INTEGER},
       paper_type = #{paperType,jdbcType=INTEGER},
       grade_level = #{gradeLevel,jdbcType=INTEGER},
       score = #{score,jdbcType=INTEGER},
@@ -248,15 +258,14 @@
     SELECT
     e.*
     FROM t_exam_paper e
-    left join t_exam_paper_department d on e.id = d.exam_paper_id
     left join t_exam_paper_subject s on e.id = s.exam_paper_id
     <where>
         and e.deleted=0
       <if test="id != null ">
         and e.id= #{id}
       </if>
-      <if test="level != null ">
-        and d.department_id= #{level} and d.deleted = 0
+      <if test="deptIds != null and deptIds.size() > 0">
+        and e.dept_id in <foreach collection="deptIds" item="item" open="(" separator="," close=")"> #{item} </foreach>
       </if>
       <if test="subjectId != null ">
         and s.subject_id= #{subjectId} and s.deleted = 0
@@ -368,6 +377,12 @@
 
   <select id="selectAllCount"  resultType="java.lang.Integer">
 		SELECT count(*) from t_exam_paper where deleted=0
+		<if test="deptIds != null and deptIds.size() > 0">
+          and dept_id in
+          <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+          </foreach>
+        </if>
 	</select>
 
   <select id="selectCountByDate"  resultType="com.mindskip.xzs.domain.other.KeyValue">
@@ -423,4 +438,15 @@
     where a.exam_paper_id = #{id}
   </select>
 
+    <select id="list" resultType="com.mindskip.xzs.domain.ExamPaper">
+    select id, name from t_exam_paper
+    <if test="deptIds != null and deptIds.size() > 0">
+    where dept_id in
+    <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+        #{item}
+    </foreach>
+    </if>
+    order by create_time desc
+    </select>
+
 </mapper>

--
Gitblit v1.8.0