创建pdf题卡修改

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

@@ -411,7 +411,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             if (examStudentList != null && examStudentList.size() > 0) {
                                 for (ExamStudent t : examStudentList) {
                                     // 用带条码的模板
-                                    basicAttachmentList.add(createPdfUtil.examStudentHtml(examCardDetail.getHtmlContent(), t, paperType, examDetail, examDetailCourse, sysUser.getId(), studentCardPdfList, basicCardRule));
+                                    basicAttachmentList.add(createPdfUtil.examStudentHtml(examCardDetail.getHtmlContent(), t, s, examDetail, examDetailCourse, sysUser.getId(), studentCardPdfList, basicCardRule));
                                 }
                             } else if (examDetail.getPrintCount() != null) {
                                 AtomicInteger atomicInteger = new AtomicInteger(0);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -195,8 +195,7 @@ public class PdfUtil {
         sysConfig = Objects.isNull(sysConfig) ? commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST) : sysConfig;
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
 
-        String pdfSize = sysConfig.getConfigValue().replace("8K", "A6");
-        List<String> pdfSizeList = Objects.nonNull(sysConfig) ? Arrays.asList(pdfSize.replaceAll("\\[", "").replaceAll("\\]", "").split(", ")) : null;
+        List<String> pdfSizeList = Objects.nonNull(sysConfig) ? Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", ")) : null;
 
         PageSizeEnum finalPageSizeEnum = pageSizeEnum;
         long count = pdfSizeList.stream().filter(s -> finalPageSizeEnum.name().equalsIgnoreCase(s)).count();