3.4.2 update

distributed-print-business/src/main/resources/mapper/BasicCardRuleMapper.xml

@@ -37,7 +37,7 @@
         select id, school_id, name, exam_number_style,exam_number_digit, paper_type, exam_absent, write_sign, discipline,undertaking_enable, undertaking_body,default_option_number,required_fields, extend_fields,fill_fields, title_rule,first_level_subheading,second_level_subheading, attention, objective_attention, subjective_attention, enable, remark, create_id, create_time, update_id, update_time, fill_number from basic_card_rule
     </sql>
     <select id="listPage" resultType="com.qmth.distributed.print.business.entity.BasicCardRule">
-        <include refid="Base_Column_List"></include>
+        select * from basic_card_rule
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and school_id = #{schoolId}

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -534,7 +534,6 @@
             left join (select * from basic_exam_student where exam_id=#{req.examId}) bes on s.basic_student_id = bes.id
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
-            and s.paper_type = t.paper_type
         left join sys_user su on bes.teacher_id = su.id
         left join (select * from basic_course where school_id = #{schoolId}) bc on s.course_id = bc.id
         <include refid="archiveQuery"/>
@@ -563,7 +562,6 @@
         FROM mark_student s
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
-            and s.paper_type = t.paper_type
             left join (select * from basic_exam_student where exam_id=#{req.examId}) bes on s.basic_student_id = bes.id
         left join sys_user su on bes.teacher_id = su.id
         left join (select * from basic_course where school_id = #{schoolId}) bc on s.course_id = bc.id
@@ -587,7 +585,6 @@
         FROM mark_student s
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
-            and s.paper_type = t.paper_type
             left join (select * from basic_exam_student where exam_id=#{req.examId}) bes on s.basic_student_id = bes.id
         left join sys_user su on bes.teacher_id = su.id
         left join (select * from basic_course where school_id = #{schoolId}) bc on s.course_id = bc.id
@@ -612,7 +609,6 @@
         FROM mark_student s
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
-            and s.paper_type = t.paper_type
             left join (select * from basic_exam_student where exam_id=#{req.examId}) bes on s.basic_student_id = bes.id
         left join sys_user su on bes.teacher_id = su.id
         left join (select * from basic_course where school_id = #{schoolId}) bc on s.course_id = bc.id
@@ -664,7 +660,7 @@
         </if>
         <if test="status != null and status != ''">
             and exists(select 1 from mark_paper mp where t.exam_id = mp.exam_id and t.course_paper_id =
-            mp.course_paper_id and t.paper_type = mp.paper_type and mp.status = #{status})
+            mp.course_paper_id and mp.status = #{status})
         </if>
         <if test="dpr != null">
             <if test="dpr.requestUserId != null">
@@ -697,7 +693,6 @@
         FROM mark_student s
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
-            and s.paper_type = t.paper_type
             left join (select * from basic_exam_student where exam_id=#{req.examId}) bes on s.basic_student_id = bes.id
         left join sys_user su on bes.teacher_id = su.id
         left join (select * from basic_course where school_id = #{schoolId}) bc on s.course_id = bc.id
@@ -716,7 +711,6 @@
         <if test="markStudent.markPaperStatus != null">
             INNER JOIN mark_paper mp ON ms.exam_id = mp.exam_id
                                             and ms.paper_number = mp.paper_number
-                                            and ms.paper_type = mp.paper_type
                                             and mp.status = #{markStudent.markPaperStatus}
         </if>
         <where>
@@ -771,7 +765,6 @@
         <if test="markStudent.markPaperStatus != null">
             INNER JOIN mark_paper mp ON ms.exam_id = mp.exam_id
             and ms.paper_number = mp.paper_number
-            and ms.paper_type = mp.paper_type
             and mp.status = #{markStudent.markPaperStatus}
         </if>
         <where>
@@ -821,7 +814,7 @@
             </if>
             <if test="status != null">
                 AND exists(select 1 from mark_paper mp where ms.exam_id = mp.exam_id and ms.paper_number =
-                mp.paper_number and ms.paper_type = mp.paper_type and mp.status = #{status})
+                mp.paper_number and mp.status = #{status})
             </if>
         </where>
     </select>
@@ -959,7 +952,7 @@
             </if>
             <if test="markStudent.markPaperStatus != null">
                 AND exists(select 1 from mark_paper mp where ms.exam_id = mp.exam_id and ms.paper_number =
-                mp.paper_number and ms.paper_type = mp.paper_type and mp.status = #{markStudent.markPaperStatus})
+                mp.paper_number and mp.status = #{markStudent.markPaperStatus})
             </if>
             <if test="teachClassName != null and teachClassName != ''">
                 and bes.teach_class_name = #{teachClassName}