Merge remote-tracking branch 'origin/master'

11 달 전 · 130d9c02dd
--- 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);
            });
--- 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 @@
                </foreach>
            </if>
            <if test="param.userRegionCode != null">
                and prfd.region_code = param.userRegionCode}
                and prfd.region_code = #{param.userRegionCode}
            </if>
        </if>
        order by prfd.update_on desc
--- 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 @@
  </head>
  <body>
    <div class="pdf">
      <p class="title">
        <span class="tit">#title#</span>
      </p>
      <p class="title">#title</p>
      <div class="tab">
        <p class="projectId">
          <span>
--- 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;
--- 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 @@
  </head>
  <body>
    <div class="pdf">
      <p class="title">
        <span class="tit">#title#</span>
      </p>
      <p class="title">#title#</p>
      <div class="tab">
        <p class="projectId">
          <span>