pdf生成bug

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

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamDetailCourseMapper;
 import com.qmth.distributed.print.business.service.ExamDetailCourseService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
+import com.qmth.teachcloud.common.enums.TaskStatusEnum;
 import com.qmth.teachcloud.common.util.ConvertUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,7 +53,7 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
 
     @Override
     public List<ExamDetailCourse> listByExamDetailIdAndStatus(Long examDetailId) {
-        return this.baseMapper.listByExamDetailIdAndStatus(examDetailId, ExamDetailStatusEnum.FINISH.name());
+        return this.baseMapper.listByExamDetailIdAndStatus(examDetailId, ExamStatusEnum.SUBMIT.name());
     }
 
     @Override

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

@@ -193,7 +193,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
             // 更新考生关联类型
 //            examStudentService.updatePaperType(examDetailCourseIds, paperParam.getRelatePaperType());
             ExamTaskDetail examTaskDetail = this.getByExamTaskId(newExamTask.getId());
-            List<String> types = Arrays.asList(paperParam.getRelatePaperType().split("/"));
+            List<String> types = Arrays.asList(paperParam.getRelatePaperType().split(","));
             int drawCount = examTaskDetail.getDrawCount().intValue();
             if (drawCount - types.size() > 0) {
                 throw ExceptionResultEnum.ERROR.exception("没有足够数量的卷型可用");

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

@@ -48,8 +48,11 @@
             exam_task b ON a.school_id = b.school_id
                 AND a.course_code = b.course_code
                 AND a.paper_number = b.paper_number
+                LEFT JOIN
+            t_f_flow_approve c ON b.flow_id = c.flow_id
         WHERE
-            a.exam_detail_id = #{examDetailId} AND b.status != #{status}
+            a.exam_detail_id = #{examDetailId} AND b.status = #{status}
+            AND (c.status is not null and c.status != 'FINISH')
     </select>
     <select id="listCoursesByPrintPlanId" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT