5 changed files with 14 additions and 18 deletions
Unified View
Diff Options
-
+4 -1pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java
-
+1 -1pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml
-
+3 -7pmapi/src/main/resources/template/区县-预审申请单.html
-
+3 -2pmapi/src/main/resources/template/市级-预审申请单.html
-
+3 -7pmapi/src/main/resources/template/建设方案申请单.html
+ 4
- 1
pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java
View File
| @@ -216,7 +216,7 @@ public class ExpertExportManage { | |||||
| experts.forEach(w -> { | experts.forEach(w -> { | ||||
| ExpertInfoDTO expert = new ExpertInfoDTO(); | ExpertInfoDTO expert = new ExpertInfoDTO(); | ||||
| if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) { | if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) { | ||||
| expert.setBank(w.getExpertName() + "（请假）"); | |||||
| expert.setName(w.getExpertName() + "（请假）"); | |||||
| } else { | } else { | ||||
| expert.setName(w.getExpertName()); | expert.setName(w.getExpertName()); | ||||
| } | } | ||||
| @@ -224,6 +224,9 @@ public class ExpertExportManage { | |||||
| if (expertUser != null) { | if (expertUser != null) { | ||||
| expert.setCompany(expertUser.getCompany()); | expert.setCompany(expertUser.getCompany()); | ||||
| expert.setJob(expertUser.getAdministrativeDuties()); | expert.setJob(expertUser.getAdministrativeDuties()); | ||||
| } else { | |||||
| expert.setCompany(StrUtil.EMPTY); | |||||
| expert.setJob(StrUtil.EMPTY); | |||||
| } | } | ||||
| data.getExperts().add(expert); | data.getExperts().add(expert); | ||||
| }); | }); | ||||
+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml
View File
| @@ -75,7 +75,7 @@ | |||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| <if test="param.userRegionCode != null"> | <if test="param.userRegionCode != null"> | ||||
| and prfd.region_code = param.userRegionCode} | |||||
| and prfd.region_code = #{param.userRegionCode} | |||||
| </if> | </if> | ||||
| </if> | </if> | ||||
| order by prfd.update_on desc | order by prfd.update_on desc | ||||
+ 3
- 7
pmapi/src/main/resources/template/区县-预审申请单.html
View File
| @@ -25,10 +25,8 @@ | |||||
| margin: 0; | margin: 0; | ||||
| font-family: SimSun; | font-family: SimSun; | ||||
| word-break: break-all; | word-break: break-all; | ||||
| height: 80px; | |||||
| } | |||||
| .tit { | |||||
| word-break: break-all; | |||||
| white-space: pre-wrap; | |||||
| width: 100%; | |||||
| } | } | ||||
| .tab { | .tab { | ||||
| padding: 0 20px; | padding: 0 20px; | ||||
| @@ -105,9 +103,7 @@ | |||||
| </head> | </head> | ||||
| <body> | <body> | ||||
| <div class="pdf"> | <div class="pdf"> | ||||
| <p class="title"> | |||||
| <span class="tit">#title#</span> | |||||
| </p> | |||||
| <p class="title">#title</p> | |||||
| <div class="tab"> | <div class="tab"> | ||||
| <p class="projectId"> | <p class="projectId"> | ||||
| <span> | <span> | ||||
+ 3
- 2
pmapi/src/main/resources/template/市级-预审申请单.html
View File
| @@ -20,12 +20,13 @@ | |||||
| text-align: center; | text-align: center; | ||||
| } | } | ||||
| .title { | .title { | ||||
| padding: 0 0 20px 0; | |||||
| padding: 0 10px 20px 10px; | |||||
| font-size: 34px; | font-size: 34px; | ||||
| margin: 0; | margin: 0; | ||||
| font-family: SimSun; | font-family: SimSun; | ||||
| word-break: break-all; | word-break: break-all; | ||||
| height: 80px; | |||||
| white-space: pre-wrap; | |||||
| width: 100%; | |||||
| } | } | ||||
| .tit { | .tit { | ||||
| word-break: break-all; | word-break: break-all; | ||||
+ 3
- 7
pmapi/src/main/resources/template/建设方案申请单.html
View File
| @@ -25,10 +25,8 @@ | |||||
| margin: 0; | margin: 0; | ||||
| font-family: SimSun; | font-family: SimSun; | ||||
| word-break: break-all; | word-break: break-all; | ||||
| height: 80px; | |||||
| } | |||||
| .tit { | |||||
| word-break: break-all; | |||||
| white-space: pre-wrap; | |||||
| width: 100%; | |||||
| } | } | ||||
| .tab { | .tab { | ||||
| padding: 0 20px; | padding: 0 20px; | ||||
| @@ -105,9 +103,7 @@ | |||||
| </head> | </head> | ||||
| <body> | <body> | ||||
| <div class="pdf"> | <div class="pdf"> | ||||
| <p class="title"> | |||||
| <span class="tit">#title#</span> | |||||
| </p> | |||||
| <p class="title">#title#</p> | |||||
| <div class="tab"> | <div class="tab"> | ||||
| <p class="projectId"> | <p class="projectId"> | ||||
| <span> | <span> | ||||