浏览代码

Merge remote-tracking branch 'origin/dev_v3.4.2' into dev_v3.4.2

wangliang 7 月之前
父节点
当前提交
a2f44b8fa3

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

@@ -329,10 +329,11 @@ public class PdfTaskLogicServiceImpl implements PdfTaskLogicService {
 
                 JSONObject jsonObject = new JSONObject();
                 JSONArray jsonArray = new JSONArray();
+                AtomicInteger integer = new AtomicInteger(1);
                 for (String s : paperTypes) {
                     examCard = examCardMap.get(s);
                     for (int i = 1; i <= backupCount; i++) {
-                        String backupPackageCode = examDetail.getPackageCode() + String.format(SystemConstant.DATE_TIME_FORMAT, i);
+                        String backupPackageCode = examDetail.getPackageCode() + String.format(SystemConstant.DATE_TIME_FORMAT, integer.getAndIncrement());
 
                         String replaceBackupCardHtmlContent = createPdfUtil.replaceBackupCardHtmlParam(basicCourse != null ? basicCourse.getCode() : null, examCard, s, basicCardRule, backupPackageCode);
                         File pdfFile = PdfUtil.htmlToPdf(examCard.getPageSize(), replaceBackupCardHtmlContent);