From 7b96c03c0f841c668ec55b71126ab18af7fb6659 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 24 Apr 2023 16:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 12 +++++++++++- pmapi/src/main/resources/template/预审申请单.html | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 516db34..0b1767f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -957,8 +957,13 @@ public class TodoCenterManage { * @since 2023/03/16 22:46 */ public Long getNotSealedPdf(Long projectId) { - // 设置pdf模板参数 Project project = projectService.getById(projectId); + Long pretrialFileId = project.getPretrialFileId(); + // 如果项目关联的预审文件ID不为空，说明已经进行过盖章审核，直接返回盖章后的预审申请单文件ID + if (Objects.nonNull(pretrialFileId)){ + return pretrialFileId; + } + // 设置pdf模板参数 JSONObject paramsMap = assemblyPdfParams(project); paramsMap.put("superOrgOpinion",null); paramsMap.put("superOrgAuditDate",null); @@ -1072,6 +1077,10 @@ public class TodoCenterManage { paramsMap.put("yearPlanInvest",yearPlanInvest); // TODO 根据地区编码获取当地大数据局(中心)的名称 paramsMap.put("bigDataBureauName",null); + // 备注模块如果为空 + if (Objects.isNull(pdfGenerateDTO.getProjectRemarks())){ + paramsMap.put("projectRemarks",null); + } // 获取立项依据 String buildBasis = project.getBuildBasis(); @@ -1097,6 +1106,7 @@ public class TodoCenterManage { } String buildBasisList = builder.toString(); paramsMap.put("buildBasisList",buildBasisList); + return paramsMap; } diff --git a/pmapi/src/main/resources/template/预审申请单.html b/pmapi/src/main/resources/template/预审申请单.html index d0d2937..1319e8b 100644 --- a/pmapi/src/main/resources/template/预审申请单.html +++ b/pmapi/src/main/resources/template/预审申请单.html @@ -24,6 +24,10 @@ font-size: 34px; margin: 40px 0 0 0; font-family: SimSun; + word-break: break-all; + } + .tit { + word-break: break-all; } .tab { padding: 0 20px; @@ -84,7 +88,7 @@

- #title# + #title#