From 269031cf8e6d1e4643e1be2b822bbfebcf87ea4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 16 Jul 2021 22:39:49 +0800
Subject: [PATCH] 考试成绩计算接口新增

---
 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml |   86 ++++++++++---------------------------------
 1 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index aa9ba40..910ee3d 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -2,77 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.modules.exam.mapper.ExamPaperMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="noticeResultMap" type="org.springblade.modules.exam.entity.ExamPaper">
-        <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="release_time" property="releaseTime"/>
-        <result column="title" property="title"/>
-        <result column="content" property="content"/>
+    <resultMap id="PagerSubject" type="org.springblade.modules.exam.vo.ExamPaperSubjectVO"
+               autoMapping="true">
+        <id property="id" column="id"/>
+        <collection property="examExaminationSubjects" javaType="java.util.List" ofType="org.springblade.modules.exam.entity.ExamExaminationSubject" autoMapping="true">
+            <id property="id" column="tid"/>
+            <association property="examSubjectChoices" javaType="org.springblade.modules.exam.entity.ExamSubjectChoices" autoMapping="true">
+                <id property="id" column="sid"/>
+            </association>
+        </collection>
     </resultMap>
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="noticeVOResultMap" type="org.springblade.modules.exam.vo.ExamPaperVO">
-        <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="release_time" property="releaseTime"/>
-        <result column="title" property="title"/>
-        <result column="content" property="content"/>
-    </resultMap>
-
-    <select id="topList" resultMap="noticeResultMap">
-        select * from blade_notice limit #{number}
-    </select>
-
-    <select id="selectNoticePage" resultMap="noticeVOResultMap">
+    <select id="queryPagerSubject" resultMap="PagerSubject">
         SELECT
-        n.*,
-        d.dict_value AS categoryName
+        sj.*,
+        tm.id tid,
+        tmxq.id as sid,tmxq.subject_name,tmxq.answer,tmxq.analysis
         FROM
-        blade_notice n
-        LEFT JOIN
-        ( SELECT * FROM blade_dict WHERE code = 'notice' ) d
-        ON
-        n.category = d.dict_key
-        <if test="notice.deptId!=null and notice.jurisdiction!=null">
-            left join
-            blade_user bu
-            on
-            bu.dept_id = n.dept_id
-        </if>
+        ksxt_exam sj
+        LEFT JOIN exam_examination_subject tm ON sj.id = tm.examination_id
+        LEFT JOIN exam_subject_choices tmxq ON tm.subject_id = tmxq.id
         WHERE
-        n.is_deleted = 0
-        <if test="notice.title!=null">
-            and n.title like concat(concat('%', #{notice.title}), '%')
-        </if>
-        <if test="notice.category!=null">
-            and n.category = #{notice.category}
-        </if>
-        <if test="notice.deptId!=null and notice.jurisdiction!=null">
-            and (n.dept_id = #{notice.deptId} or bu.jurisdiction = #{notice.jurisdiction}
-            or n.dept_id = 1123598813738675201
-            )
-        </if>
-        <if test="notice.deptId!=null and notice.jurisdiction==null">
-            and (n.dept_id = #{notice.deptId} and n.category=2
-            or n.dept_id = 1123598813738675201
-            )
-        </if>
-        <if test="notice.startTime!=null and notice.startTime!=''">
-            and n.release_time &gt;= #{notice.startTime}
-        </if>
-        <if test="notice.endTime!=null and notice.endTime!=''">
-            and n.release_time &lt;= #{notice.endTime}
+        1 = 1
+        <if test="paper.id !=null">
+        and sj.id = #{paper.id}
         </if>
     </select>
+
 </mapper>

--
Gitblit v1.9.3