3.2.4 bug修复

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

@@ -242,9 +242,6 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         if (Objects.isNull(basicExamRule)) {
             throw ExceptionResultEnum.ERROR.exception("未找到学校的通用规则");
         }
-        if (printContentList.contains("PAPER") && !printContentList.contains("CARD")) {
-            throw ExceptionResultEnum.ERROR.exception("如果试卷题卡印品选择了试卷，题卡必须被选择");
-        }
 
         ExamPrintPlan examPrintPlan = new ExamPrintPlan();
         BeanUtils.copyProperties(printPlanParams, examPrintPlan);

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

@@ -1659,8 +1659,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setReview(basicPrintConfig.getReview());
             examTask.setUserId(sysUser.getId());
             examTask.setStatus(ExamStatusEnum.SUBMIT);
-            examTask.setStartTime(examTask.getExamStartTime());
-            examTask.setEndTime(examTask.getExamEndTime());
+//            examTask.setStartTime(examTask.getExamStartTime());
+//            examTask.setEndTime(examTask.getExamEndTime());
             examTask.setCreateId(sysUser.getId());
             examTask.setCreateTime(System.currentTimeMillis());
 

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

@@ -110,8 +110,16 @@
     </select>
 
     <select id="list" resultType="com.qmth.distributed.print.business.bean.result.PrintPlanBrief">
-        select a.id, a.name, a.status from exam_print_plan a left join sys_user b on a.create_id = b.id
+        select a.id, a.name, a.status
+            from exam_print_plan a
+                left join
+            sys_user b on a.create_id = b.id
+                left join
+            basic_exam be on a.exam_id = be.id
+                left join
+            basic_semester bs on be.semester_id = bs.id
         <where>
+            and bs.enable = true and be.enable = true
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>

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

@@ -37,7 +37,7 @@
         join exam_detail_course edc on
             edc.id = es.exam_detail_course_id
         join exam_task et on
-            bs.school_id = et.school_id and edc.course_code = et.course_code and edc.paper_number = et.paper_number
+            bs.school_id = et.school_id and es.exam_id = et.exam_id and edc.course_code = et.course_code and edc.paper_number = et.paper_number
         join basic_exam be on
             et.exam_id = be.id
         join sys_user su on