3.2.7 bug修改

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

@@ -95,6 +95,8 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
     List<Map> listStudentByExamDetailCourseId(@Param("schoolId") Long schoolId, @Param("examDetailCourseId") Long examDetailCourseId, @Param("ticketNumber") String ticketNumber, @Param("type") String type);
 
     String selectPaperCount(@Param("schoolId") Long schoolId,
+                             @Param("semesterId") Long semesterId,
+                             @Param("examId") Long examId,
                              @Param("printPlanId") Long printPlanId,
                              @Param("status") String status,
                              @Param("courseCode") String courseCode,

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

@@ -182,7 +182,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
         if (printTaskTotalDto != null) {
             // 试卷总计
-            String paperNumberStrs = this.baseMapper.selectPaperCount(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printHouseId, dpr);
+            String paperNumberStrs = this.baseMapper.selectPaperCount(schoolId, semesterId, examId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printHouseId, dpr);
             if (StringUtils.isNotBlank(paperNumberStrs)) {
                 String[] paperNumbers = paperNumberStrs.split(",");
                 Set<String> paperNumberSet = new HashSet<>(Arrays.asList(paperNumbers));

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

@@ -501,16 +501,24 @@
         FROM
             exam_print_plan a
             JOIN
-        exam_detail b ON a.id = b.print_plan_id
-            JOIN
-        exam_detail_course c ON b.id = c.exam_detail_id
-            JOIN
-        sys_user d ON a.create_id = d.id
+            exam_detail b ON a.id = b.print_plan_id
+                JOIN
+            exam_detail_course c ON b.id = c.exam_detail_id
+                JOIN
+            sys_user d ON a.create_id = d.id
+                JOIN
+            basic_exam e ON a.exam_id = e.id
         <where>
-            and c.paper_type is not null
+            and c.paper_type is not null and e.enable = true
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
+            <if test="semesterId != null and semesterId != ''">
+                and e.semester_id = #{semesterId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and e.id = #{examId}
+            </if>
             <if test="printPlanId != null and printPlanId != ''">
                 and a.id = #{printPlanId}
             </if>