diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 66ec3dc3e..2d73b01d4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -5326,6 +5326,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { Map fileMap = new HashMap<>(); - fileMap.put("item.fileName", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); - fileMap.put("item.filePath", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); + fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); + fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); /*fileMap.put("item.fileName", file.getFileName()); fileMap.put("item.filePath", file.getUrl());*/ dataList.add(fileMap); @@ -5610,11 +5612,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designMap = new HashMap<>(); - designMap.put("design.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); - designMap.put("design.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); - designMap.put("design.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); - designMap.put("design.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); - designMap.put("design.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); + designMap.put("DESIGN_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); + designMap.put("DESIGN_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); + designMap.put("DESIGN_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); + designMap.put("DESIGN_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); + designMap.put("DESIGN_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : ""); /*designMap.put("design.result", processHistory.getReviewResult()); designMap.put("design.opinion", processHistory.getApprovalOpinion()); @@ -5632,11 +5634,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyMap = new HashMap<>(); - verifyMap.put("verify.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); - verifyMap.put("verify.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); - verifyMap.put("verify.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); - verifyMap.put("verify.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); - verifyMap.put("verify.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); + verifyMap.put("VERIFY_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); + verifyMap.put("VERIFY_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); + verifyMap.put("VERIFY_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); + verifyMap.put("VERIFY_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); + verifyMap.put("VERIFY_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : ""); /*verifyMap.put("verify.result", processHistory.getReviewResult()); verifyMap.put("verify.opinion", processHistory.getApprovalOpinion()); diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/exportPdfTemp/ComplianceReportTemplate.docx b/jero-boot/jero-boot-single-startup/src/main/resources/exportPdfTemp/ComplianceReportTemplate.docx index 2bf565eb2..9b5c9a8dd 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/exportPdfTemp/ComplianceReportTemplate.docx and b/jero-boot/jero-boot-single-startup/src/main/resources/exportPdfTemp/ComplianceReportTemplate.docx differ