Browse Source

3.2.4 客户端bug修改

xiaofei 2 years ago
parent
commit
1686efcd15

+ 4 - 4
distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -219,7 +219,7 @@
                 LEFT JOIN
             basic_exam be ON a.exam_id = be.id
         <where>
-            and a.school_id = #{schoolId}
+            and a.school_id = #{schoolId} and be.enable = true
             AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
@@ -322,7 +322,7 @@
             LEFT JOIN
         basic_exam be ON a.exam_id = be.id
         <where>
-            and a.school_id = #{schoolId}
+            and a.school_id = #{schoolId} and be.enable = true
             AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
@@ -428,7 +428,7 @@
                 LEFT JOIN
             basic_exam be ON a.exam_id = be.id
         <where>
-            and a.school_id = #{schoolId}
+            and a.school_id = #{schoolId} and be.enable = true
             AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
@@ -505,7 +505,7 @@
             LEFT JOIN
         basic_exam be ON a.exam_id = be.id
         <where>
-            and a.school_id = #{schoolId}
+            and a.school_id = #{schoolId} and be.enable = true
             AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">

+ 1 - 1
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -690,7 +690,7 @@
         LEFT JOIN
             sys_user g ON a.create_id = g.id
         <where>
-            and a.school_id = #{schoolId}
+            and a.school_id = #{schoolId} and be.enable = true
             and a.status = #{printPlanStatus}
             AND (d.status = 'SUBMIT' and (ffa.status = 'FINISH' or ffa.status is null))
             and LOCATE('PAPER', a.print_content) > 0