From 6b0aa2e0cc4ea5cdfa5bf9e3787eae044047e359 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 27 Nov 2023 10:31:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/resources/template/区县-预审申请单.html | 10 +++------- pmapi/src/main/resources/template/市级-预审申请单.html | 5 +++-- pmapi/src/main/resources/template/建设方案申请单.html | 10 +++------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/pmapi/src/main/resources/template/区县-预审申请单.html b/pmapi/src/main/resources/template/区县-预审申请单.html index c5242c9..b4a73d5 100644 --- a/pmapi/src/main/resources/template/区县-预审申请单.html +++ b/pmapi/src/main/resources/template/区县-预审申请单.html @@ -25,10 +25,8 @@ margin: 0; font-family: SimSun; word-break: break-all; - height: 80px; - } - .tit { - word-break: break-all; + white-space: pre-wrap; + width: 100%; } .tab { padding: 0 20px; @@ -105,9 +103,7 @@
-

- #title# -

+

#title

diff --git a/pmapi/src/main/resources/template/市级-预审申请单.html b/pmapi/src/main/resources/template/市级-预审申请单.html index e6ffff5..bfcc97c 100644 --- a/pmapi/src/main/resources/template/市级-预审申请单.html +++ b/pmapi/src/main/resources/template/市级-预审申请单.html @@ -20,12 +20,13 @@ text-align: center; } .title { - padding: 0 0 20px 0; + padding: 0 10px 20px 10px; font-size: 34px; margin: 0; font-family: SimSun; word-break: break-all; - height: 80px; + white-space: pre-wrap; + width: 100%; } .tit { word-break: break-all; diff --git a/pmapi/src/main/resources/template/建设方案申请单.html b/pmapi/src/main/resources/template/建设方案申请单.html index c548ce8..ee7575c 100644 --- a/pmapi/src/main/resources/template/建设方案申请单.html +++ b/pmapi/src/main/resources/template/建设方案申请单.html @@ -25,10 +25,8 @@ margin: 0; font-family: SimSun; word-break: break-all; - height: 80px; - } - .tit { - word-break: break-all; + white-space: pre-wrap; + width: 100%; } .tab { padding: 0 20px; @@ -105,9 +103,7 @@

-

- #title# -

+

#title#

From db690769ec225ca7e9d8e2bccd0af21ef38a719c Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 27 Nov 2023 14:58:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=AD=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java | 5 ++++- .../pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java index 6c0a185..f331fd7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java @@ -216,7 +216,7 @@ public class ExpertExportManage { experts.forEach(w -> { ExpertInfoDTO expert = new ExpertInfoDTO(); if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) { - expert.setBank(w.getExpertName() + "（请假）"); + expert.setName(w.getExpertName() + "（请假）"); } else { expert.setName(w.getExpertName()); } @@ -224,6 +224,9 @@ public class ExpertExportManage { if (expertUser != null) { expert.setCompany(expertUser.getCompany()); expert.setJob(expertUser.getAdministrativeDuties()); + } else { + expert.setCompany(StrUtil.EMPTY); + expert.setJob(StrUtil.EMPTY); } data.getExperts().add(expert); }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml index 1c5ce38..08fe194 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml @@ -75,7 +75,7 @@ - and prfd.region_code = param.userRegionCode} + and prfd.region_code = #{param.userRegionCode} order by prfd.update_on desc