3.2.3 bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ConditionMapper.java

@@ -21,11 +21,11 @@ public interface ConditionMapper {
 
     List<BasicCourse> listCourseForApply(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable, @Param("userId") Long userId);
 
-    List<BasicCourse> listCourseForAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable, @Param("userId") Long userId);
+    List<BasicCourse> listCourseForAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable);
 
     List<String> listPaperNumberForApply(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("userId") Long userId);
 
-    List<String> listPaperNumberAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("userId") Long userId);
+    List<String> listPaperNumberAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     List<PrintPlanBrief> listPrintPlan(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ConditionServiceImpl.java

@@ -78,7 +78,7 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 入库审核菜单
         else if ("41".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForAudit(semesterId, examId, enable, sysUser.getId());
+            return conditionMapper.listCourseForAudit(semesterId, examId, enable);
         }
         // 成绩查询
         else if ("487".equals(privilegeIdString)) {
@@ -115,7 +115,7 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 入库审核菜单
         else if ("41".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberAudit(semesterId, examId, courseCode, sysUser.getId());
+            return conditionMapper.listPaperNumberAudit(semesterId, examId, courseCode);
         } else {
             return conditionMapper.listPaperNumber(semesterId, examId, courseCode, printPlanIds, dpr);
         }

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

@@ -114,11 +114,15 @@
             EXISTS( SELECT
             1
             FROM
-            exam_task et
+                exam_task et
+                    LEFT JOIN
+                basic_exam be ON et.exam_id = be.id
             <where>
-                bc.school_id = et.school_id
+                AND bc.school_id = et.school_id
                 AND bc.code = et.course_code
-                et.enable = true and et.review = true
+                <if test="semesterId != null">
+                    AND be.semester_id = #{semesterId}
+                </if>
                 <if test="examId != null">
                     AND et.exam_id = #{examId}
                 </if>
@@ -169,9 +173,6 @@
             <if test="courseCode != null and courseCode != ''">
                 AND et.course_code = #{courseCode}
             </if>
-            <if test="userId != null">
-                AND et.user_id = #{userId}
-            </if>
         </where>
         order by et.paper_number
     </select>