瀏覽代碼

Merge branch 'dev_v2.2.2' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.2

xiaof 3 年之前
父節點
當前提交
bef6450dfa

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

@@ -742,8 +742,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         for (ExamTaskDto record : examTaskDtoIPage.getRecords()) {
         for (ExamTaskDto record : examTaskDtoIPage.getRecords()) {
 //            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,record.getCourseCode(),paperNumber, printPlanStatusEnumList);
 //            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,record.getCourseCode(),paperNumber, printPlanStatusEnumList);
 //            record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
 //            record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
-            if ((record.getReview() && FlowApproveSetupEnum.FINISH.name().equals(record.getAuditStatus())
-                    || (!record.getReview()))) {
+            if ((!record.getReview() || FlowStatusEnum.FINISH.name().equals(record.getAuditStatus()))) {
                 record.setApproveFormStatus(true);
                 record.setApproveFormStatus(true);
             } else {
             } else {
                 record.setApproveFormStatus(false);
                 record.setApproveFormStatus(false);