3.0.0-bug修改

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

@@ -189,11 +189,13 @@ public class PrintCommonServiceServiceImpl implements PrintCommonService {
                 pdfFile.getParentFile().mkdirs();
                 pdfFile.createNewFile();
             }
-            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
+             if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                 HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A3);
             } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
                 HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
-            }
+            } else {
+                 HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
+             }
 
 //            File pdfFile = asposePdfUtil.documentToPdf(htmlFile.getPath(), destUrl, PaperSize.A4);
             String htmlFileMd5 = DigestUtils.md5Hex(new FileInputStream(htmlFile));

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

@@ -302,7 +302,7 @@ public class CreatePdfUtil {
         htmlMap.put("paperCode", examDetail.getPackageCode());
         htmlMap.put("paperCodeImg", GoogleBarCodeUtil.createBarCode(examDetail.getPackageCode(), false));
 
-        int pageSize = 80;
+        int pageSize = 60;
         int halfPageSize = pageSize / 2;
 
         if (examStudentList.size() > 0) {

teachcloud-task/src/main/resources/application-task_test.properties

@@ -80,8 +80,8 @@ sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
+sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316