|
@@ -11,7 +11,9 @@ import com.qmth.distributed.print.business.entity.*;
|
|
|
import com.qmth.distributed.print.business.enums.DrawRuleEnum;
|
|
|
import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
|
|
|
import com.qmth.distributed.print.business.enums.PageSizeEnum;
|
|
|
+import com.qmth.distributed.print.business.enums.PrintMethodEnum;
|
|
|
import com.qmth.distributed.print.business.service.BasicAttachmentService;
|
|
|
+import com.qmth.distributed.print.business.service.BasicExamRuleService;
|
|
|
import com.qmth.distributed.print.business.service.CommonService;
|
|
|
import com.qmth.distributed.print.business.service.ExamDetailService;
|
|
|
import com.qmth.distributed.print.common.contant.SystemConstant;
|
|
@@ -54,6 +56,9 @@ public class CreatePdfUtil {
|
|
|
@Resource
|
|
|
ExamDetailService detailService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ BasicExamRuleService basicExamRuleService;
|
|
|
+
|
|
|
/**
|
|
|
* 创建登记表
|
|
|
*
|
|
@@ -325,7 +330,8 @@ public class CreatePdfUtil {
|
|
|
examDetail.setAttachmentId(basicAttachment.getId());
|
|
|
examDetail.setPagesA3(pageA3Count);
|
|
|
examDetail.setPagesA4(pageA4Count);
|
|
|
- examDetail.setStatus(ExamDetailStatusEnum.READY);
|
|
|
+ BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId();
|
|
|
+ examDetail.setStatus(PrintMethodEnum.AUTO == basicExamRule.getPrintMethod() ? ExamDetailStatusEnum.WAITING : ExamDetailStatusEnum.READY);
|
|
|
detailService.saveOrUpdate(examDetail);
|
|
|
ossUtil.ossUpload(dirName, localPdfFile, DigestUtils.md5Hex(new FileInputStream(localPdfFile)));
|
|
|
localPdfFile.delete();
|