Merge remote-tracking branch 'origin/master'

1 yıl önce · b20a954cd5
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
@@ -1155,7 +1155,9 @@ public class TodoCenterManage {
                    }
                    Long cityPdfId = generateNotSealedPdf(projectId, cityTemplateName, cityParamsMap);
                    notSealedInfoVo.setFileId(cityPdfId);
                    notSealedInfoVo.setIsCommit(Boolean.TRUE);
                    if (StringUtils.isNotBlank(auditOpinion)) {
                        notSealedInfoVo.setIsCommit(Boolean.TRUE);
                    }
                    return notSealedInfoVo;
                // 区县预审
                case RegionConst.RL_COUNTY:
@@ -1233,7 +1235,9 @@ public class TodoCenterManage {
                        }
                    }
                    notSealedInfoVo.setFileId(notSealedId);
                    notSealedInfoVo.setIsCommit(Boolean.TRUE);
                    if (StringUtils.isNotBlank(auditOpinion)) {
                        notSealedInfoVo.setIsCommit(Boolean.TRUE);
                    }
                    return notSealedInfoVo;
                default:
                    throw new IllegalStateException("Unexpected value: " + regionLevel);
@@ -1257,7 +1261,9 @@ public class TodoCenterManage {
            constructParamsMap.put("bigDataBureauAuditDate",auditDate);
            Long constructNotFileId = generateNotSealedPdf(projectId, constructTemplateName, constructParamsMap);
            notSealedInfoVo.setFileId(constructNotFileId);
            notSealedInfoVo.setIsCommit(Boolean.TRUE);
            if (StringUtils.isNotBlank(auditOpinion)) {
                notSealedInfoVo.setIsCommit(Boolean.TRUE);
            }
            return notSealedInfoVo;
        }
        return notSealedInfoVo;
--- a/pmapi/src/main/resources/template/区县-预审申请单.html
+++ b/pmapi/src/main/resources/template/区县-预审申请单.html
@@ -100,6 +100,12 @@
      .h-1460{
        height: 1460px;
      }
      .h-1000{
        height: 1000px;
      }
      .h-600{
        height: 600px;
      }
    </style>
  </head>
  <body>
@@ -170,7 +176,7 @@
              <td class="label">综合业务领域</td>
              <td align="center">#bizDomain#</td>
            </tr>
            <tr class="h-800">
            <tr class="h-600">
              <td class="label">立项依据</td>
              <td colspan="3" align="center">#buildBasisList#</td>
            </tr>
@@ -254,7 +260,7 @@
            </tr>
            <tr>
              <td class="label">备注</td>
              <td colspan="3" align="center"><p class="h-1460">#projectRemarks#</p></td>
              <td colspan="3" align="center"><p class="h-1000">#projectRemarks#</p></td>
            </tr>
            <tr>
              <td class="tabTit" colspan="4">单位意见</td>