fix:bug 模式三不显示下载审批表按钮

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDto.java

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.bean.dto;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.enums.ExamModelEnum;
 import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -60,6 +61,9 @@ public class ExamTaskDto {
     @ApiModelProperty(value = "学期名称")
     private String semesterName;
 
+    @ApiModelProperty(value = "考试模式")
+    private ExamModelEnum examModel;
+
     public Boolean getApproveFormStatus() {
         return approveFormStatus;
     }
@@ -335,4 +339,12 @@ public class ExamTaskDto {
     public void setSemesterName(String semesterName) {
         this.semesterName = semesterName;
     }
+
+    public ExamModelEnum getExamModel() {
+        return examModel;
+    }
+
+    public void setExamModel(ExamModelEnum examModel) {
+        this.examModel = examModel;
+    }
 }

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

@@ -761,14 +761,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, auditStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, sysUser.getId(), orgIds, userName);
-//        List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
-//        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
-//        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
-//        printPlanStatusEnumList.add(PrintPlanStatusEnum.END);
         for (ExamTaskDto record : examTaskDtoIPage.getRecords()) {
-//            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,record.getCourseCode(),paperNumber, printPlanStatusEnumList);
-//            record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
-            if ((!record.getReview() || FlowStatusEnum.FINISH.name().equals(record.getAuditStatus()))) {
+            if ((record.getReview() && FlowStatusEnum.FINISH.name().equals(record.getAuditStatus()) && !ExamModelEnum.MODEL3.equals(record.getExamModel()))) {
                 record.setApproveFormStatus(true);
             } else {
                 record.setApproveFormStatus(false);

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

@@ -199,6 +199,7 @@
             a.exam_id examId,
             f.name examName,
             f.semester_id semesterId,
+            f.exam_model examModel,
             g.name semesterName
         FROM
             exam_task a