From d6af2f3b151b14d5c9dd73f9de94bb994065c2ec Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 24 Jul 2023 16:55:59 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 10 +++++----- .../ningdatech/pmapi/todocenter/model/vo/NotSealedInfoVO.java | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 4031202..a132d22 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -1198,13 +1198,13 @@ public class TodoCenterManage { // 以是否有上级主管单位的维度判断(有上级条线主管单位,才有可能需要盖两次章) if (CommonEnum.YES.getCode().equals(isHigherSuperOrg)) { // 盖章审核登录用户所在单位为上级条线主管单位,此时为区县预审盖章流程第一个章 - // 如果项目关联的预审文件ID和上级条线审核意见不为空,说明已经提交过审核意见,直接返回文件ID - if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo, - project.getCountrySealAuditOpinion()))){ - return notSealedInfoVo; - } if (empPosUnitCode.equals(higherSuperOrgCode)) { // 有上级条线主管单位信息且登录用户所在单位是上级条线主管单位, + // 如果项目关联的预审文件ID和上级条线审核意见不为空,说明已经提交过审核意见,直接返回文件ID + if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo, + project.getCountrySealAuditOpinion()))){ + return notSealedInfoVo; + } countryParamsMap.put("higherOrgOpinion", auditOpinion); countryParamsMap.put("higherOrgAuditDate", auditDate); // 获取上级条线主管单位印章编号 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/NotSealedInfoVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/NotSealedInfoVO.java index 2240e13..d7a44db 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/NotSealedInfoVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/NotSealedInfoVO.java @@ -16,7 +16,5 @@ public class NotSealedInfoVO { private Long fileId; @ApiModelProperty("是否提交了审核意见") - private Boolean isCommit; - - + private Boolean isCommit = Boolean.FALSE; } From c757c756df5ac4015277b39734043c2244287248 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 24 Jul 2023 17:05:06 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E5=9D=90=E6=A0=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java index 8cb42c8..f90102a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java @@ -25,9 +25,9 @@ public interface TodoCenterConstant { public static final String COUNTRY_TEMPLATE = "区县-预审申请单"; public static final String CONSTRUCT_TEMPLATE = "建设方案申请单"; - public static final String COUNTRY_SEAL_POS_PAGE = "7"; - public static final Float COUNTRY_SEAL_POS_X = 483F; - public static final Float COUNTRY_SEAL_POS_Y = 619F; + public static final String COUNTRY_SEAL_POS_PAGE = "6"; + public static final Float COUNTRY_SEAL_POS_X = 487F; + public static final Float COUNTRY_SEAL_POS_Y = 400F; public static final Integer COUNTRY_SEAL_SIGN_TYPE = 1; } From 03035a79f411e01d7e910d89efcf321a77fcd2e2 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 24 Jul 2023 17:25:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E5=9D=90=E6=A0=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java index f90102a..5e90ab5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/TodoCenterConstant.java @@ -27,7 +27,7 @@ public interface TodoCenterConstant { public static final String COUNTRY_SEAL_POS_PAGE = "6"; public static final Float COUNTRY_SEAL_POS_X = 487F; - public static final Float COUNTRY_SEAL_POS_Y = 400F; + public static final Float COUNTRY_SEAL_POS_Y = 380F; public static final Integer COUNTRY_SEAL_SIGN_TYPE = 1; } From a41eebddda46b4f18d2c26fe22533c7d15f789a4 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 24 Jul 2023 19:17:49 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 10 ++++++++++ pmapi/src/main/resources/template/区县-预审申请单.html | 11 +++-------- pmapi/src/main/resources/template/市级-预审申请单.html | 1 + pmapi/src/main/resources/template/建设方案申请单.html | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index a132d22..fc5ad90 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -1229,6 +1229,11 @@ public class TodoCenterManage { else if (CommonEnum.YES.getCode().equals(isSuperOrg)) { // 有上级条线主管单位信息且有本级主管单位信息 // 有主管单位信息且登录用户所在单位是主管单位 + // 如果项目关联的预审文件ID和上级条线审核意见不为空,说明已经提交过审核意见,直接返回文件ID + if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo, + project.getCountrySealAuditOpinion()))){ + return notSealedInfoVo; + } // 装配本级主管单位审核意见 checkEmpPosUnitCode(empPosUnitCode,auditOpinion,auditDate,superOrgCode,countryParamsMap); // 装配上级条线主管单位意见,调用盖章接口, @@ -1239,6 +1244,11 @@ public class TodoCenterManage { }else if (CommonEnum.NO.getCode().equals(isSuperOrg)) { // 有上级条线主管单位信息,没有本级主管单位信息 // 没有选主管单位,默认为项目建设单位且登录用户所在单位为项目建设单位 + // 如果项目关联的预审文件ID和上级条线审核意见不为空,说明已经提交过审核意见,直接返回文件ID + if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo, + project.getCountrySealAuditOpinion()))){ + return notSealedInfoVo; + } checkEmpPosUnitCode(empPosUnitCode,auditOpinion,auditDate,buildOrgCode,countryParamsMap); // 装配上级条线主管单位意见,调用盖章接口, // 重新生成上级条线主管单位盖章而本级主管单位未盖章的pdf文件 diff --git a/pmapi/src/main/resources/template/区县-预审申请单.html b/pmapi/src/main/resources/template/区县-预审申请单.html index 26fbc80..c5242c9 100644 --- a/pmapi/src/main/resources/template/区县-预审申请单.html +++ b/pmapi/src/main/resources/template/区县-预审申请单.html @@ -37,6 +37,7 @@ color: #999999; text-align: left; margin-bottom: 8px; + margin-top: 0; } .projectId > .time { float: right; @@ -94,18 +95,12 @@ .h-100{ height: 100px; } - .h-800{ - height: 800px; - } - .h-1460{ - height: 1460px; + .h-400{ + height: 400px; } .h-1200{ height: 1200px; } - .h-400{ - height: 400px; - } diff --git a/pmapi/src/main/resources/template/市级-预审申请单.html b/pmapi/src/main/resources/template/市级-预审申请单.html index 75b1511..7720e9e 100644 --- a/pmapi/src/main/resources/template/市级-预审申请单.html +++ b/pmapi/src/main/resources/template/市级-预审申请单.html @@ -37,6 +37,7 @@ color: #999999; text-align: left; margin-bottom: 8px; + margin-top: 0; } .projectId > .time { float: right; diff --git a/pmapi/src/main/resources/template/建设方案申请单.html b/pmapi/src/main/resources/template/建设方案申请单.html index 4da3342..c548ce8 100644 --- a/pmapi/src/main/resources/template/建设方案申请单.html +++ b/pmapi/src/main/resources/template/建设方案申请单.html @@ -37,6 +37,7 @@ color: #999999; text-align: left; margin-bottom: 8px; + margin-top: 0; } .projectId > .time { float: right; From e4728fc9ec75d8f3825b02f824e93f241175c1bf Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 24 Jul 2023 19:24:55 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=9B=96=E7=AB=A0=E6=A8=A1=E7=89=88?= =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/resources/template/市级-预审申请单.html b/pmapi/src/main/resources/template/市级-预审申请单.html index 7720e9e..e6ffff5 100644 --- a/pmapi/src/main/resources/template/市级-预审申请单.html +++ b/pmapi/src/main/resources/template/市级-预审申请单.html @@ -9,7 +9,7 @@ Document