fix:

1.命题计划统计 - 学期查询失效
2.命题计划统计 - 班级详情取错对象

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

@@ -52,26 +52,27 @@ public interface TCStatisticsMapper extends BaseMapper<TCStatistics> {
 
     /**
      * 查询命题计划统计表
-     * @param iPage 分页参数
-     * @param examId 考试id
-     * @param collegeId 学院id
+     *
+     * @param iPage          分页参数
+     * @param semesterId     学期id
+     * @param examId         考试id
+     * @param collegeId      学院id
      * @param teachingRoomId 教研室id
-     * @param status 状态
-     * @param courseName 课程名称
-     * @param teacherName 任课教师名称
-     * @param userId 用户
+     * @param status         状态
+     * @param courseName     课程名称
+     * @param teacherName    任课教师名称
+     * @param userId         用户
      * @return 查询结果
      */
     public IPage<TCStatisticResult> findExamTaskPrintStatistic(@Param("iPage") Page<TCStatisticResult> iPage,
-                                         @Param("examId") Long examId,
-                                         @Param("collegeId") Long collegeId,
-                                         @Param("teachingRoomId") Long teachingRoomId,
-                                         @Param("status") StatisticsStatusEnum status,
-                                         @Param("courseName") String courseName,
-                                         @Param("teacherName") String teacherName,
-                                         @Param("userId") Long userId);
-
-
+                                                               @Param("semesterId") Long semesterId,
+                                                               @Param("examId") Long examId,
+                                                               @Param("collegeId") Long collegeId,
+                                                               @Param("teachingRoomId") Long teachingRoomId,
+                                                               @Param("status") StatisticsStatusEnum status,
+                                                               @Param("courseName") String courseName,
+                                                               @Param("teacherName") String teacherName,
+                                                               @Param("userId") Long userId);
 
 
     /**
@@ -96,9 +97,10 @@ public interface TCStatisticsMapper extends BaseMapper<TCStatistics> {
 
     /**
      * 根据考试id和课程编号查询命题计划统计数据
-     * @param examId 考试id
+     *
+     * @param examId     考试id
      * @param courseCode 课程编号
      * @return 命题计划统计数据
      */
-    List<ExamTaskPlanStatisticDto> findByExamIdCourseCode(@Param("examId")Long examId, @Param("courseCode") String courseCode);
+    List<ExamTaskPlanStatisticDto> findByExamIdCourseCode(@Param("examId") Long examId, @Param("courseCode") String courseCode);
 }

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

@@ -132,7 +132,7 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
                         clazzContent.setStatus(ClazzContentEnum.EXCEPTION);
                     } else if (printClazzList.size() == 1) {
                         // 该班级对应的命题任务完成印刷
-                        ExamTaskPlanStatisticDto printMatchClazz = matchClazzList.get(0);
+                        ExamTaskPlanStatisticDto printMatchClazz = printClazzList.get(0);
                         clazzContent.setExamPrintPlanId(printMatchClazz.getExamPrintPlanId());
                         clazzContent.setExamPrintPlanName(printMatchClazz.getExamPrintPlanName());
                         clazzContent.setPaperNumber(printMatchClazz.getPaperNumber());
@@ -232,7 +232,7 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
 
     @Override
     public IPage<TCStatisticResult> findExamTaskPrintStatistic(Long semesterId, Long examId, Long collegeId, Long teachingRoomId, StatisticsStatusEnum status, String courseName, String teacherName, Long schoolId, Long userId, Integer pageNumber, Integer pageSize) {
-        return tcStatisticsMapper.findExamTaskPrintStatistic(new Page<>(pageNumber,pageSize), examId, collegeId, teachingRoomId, status, courseName, teacherName, userId);
+        return tcStatisticsMapper.findExamTaskPrintStatistic(new Page<>(pageNumber,pageSize),semesterId, examId, collegeId, teachingRoomId, status, courseName, teacherName, userId);
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -372,7 +372,12 @@
             basic_exam be ON tcs.exam_id = be.id
                 LEFT JOIN
             exam_print_plan epp ON tcs.print_plan_id = epp.id
+                LEFT JOIN
+            basic_semester bs ON be.semester_id = bs.id
         <where>
+            <if test="semesterId != null and semesterId != ''">
+                and bs.id = #{semesterId}
+            </if>
             <if test="examId != null and examId != ''">
                 and tcs.exam_id = #{examId}
             </if>