Browse Source

盖章修改

master
CMM 1 year ago
parent
commit
7b96c03c0f
2 changed files with 16 additions and 2 deletions
  1. +11
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
  2. +5
    -1
      pmapi/src/main/resources/template/预审申请单.html

+ 11
- 1
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java View File

@@ -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;
}



+ 5
- 1
pmapi/src/main/resources/template/预审申请单.html View File

@@ -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 @@
<body>
<div class="pdf">
<p class="title">
<span>#title#</span>
<span class="tit">#title#</span>
</p>
<div class="tab">
<p class="projectId">


Loading…
Cancel
Save