From b67852623703023e202e246a8cee100c73a4b61b Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 8 Dec 2023 14:29:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java index 6e36faf..faac1bb 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java @@ -234,7 +234,7 @@ public class ExcelDownUtil { columnValue = jsonObject.getString(column.toString()); } } - if (CommonConst.NULL.equals(columnValue)) { + if (Objects.isNull(columnValue) || CommonConst.NULL.equals(columnValue)) { columnValue = ""; } columnValues.add(columnValue); From c75f336ca92b9227bf2be3a0a8c39fd2d37d940c Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 8 Dec 2023 14:37:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java | 2 +- pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java index 040f7e2..e246973 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java @@ -69,7 +69,7 @@ public enum ExportOptionEnum { projectIntroduction(24, "项目简介"), - baseBasis(25, "立项依据"), + buildBasis(25, "立项依据"), buildLevel(26, "建设层级"), diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java index faac1bb..e30d13b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java @@ -44,7 +44,7 @@ public class ExcelDownUtil { public static Map convertMap = Maps.newHashMap(); static { - convertMap.put("baseBasis","baseBasisEstablish"); + convertMap.put("buildBasis","baseBasisEstablish"); } public static String encodeName(String name) { From d7474423eb8ddf6b4b5afba50f7f7fe7ac4bf740 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 8 Dec 2023 16:49:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/ProjectRenewalFundManage.java | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java index 3bfc006..35b64f2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java @@ -396,7 +396,7 @@ public class ProjectRenewalFundManage { } //判断金额 - checkPaymentAmount(projectCode,projectYear,dto.getAnnualPaymentAmount()); +// checkPaymentAmount(projectCode,projectYear,dto.getAnnualPaymentAmount()); declaration.setApprovalStatus(ProjectRenewalApprovalStatusEnum.PENDING.name()); if(Objects.nonNull(project)){ @@ -443,17 +443,24 @@ public class ProjectRenewalFundManage { //3. 算出 所能申报的最大金额 //3.1 算出 申报年 以及 之前的所有合同计划金额 - Double planSum = paymentPlans.stream().filter(c -> Objects.nonNull(c.getPaymentTime()) && + BigDecimal planSum = BigDecimal.ZERO; + Optional planSumOp = paymentPlans.stream().filter(c -> Objects.nonNull(c.getPaymentTime()) && (c.getPaymentTime().getYear() - projectYear) <= 0) - .mapToDouble(c -> Objects.nonNull(c.getPaymentAmount()) ? c.getPaymentAmount().doubleValue() : 0.0) - .sum(); - - Double actualPlanSum = paymentPlans.stream().filter(c -> Objects.nonNull(c.getPaymentTime()) && + .map(c -> Objects.nonNull(c.getPaymentAmount()) ? c.getPaymentAmount() : BigDecimal.ZERO) + .reduce(BigDecimal::add); + if(planSumOp.isPresent()){ + planSum = planSumOp.get(); + } + BigDecimal actualPlanSum = BigDecimal.ZERO; + Optional actualPlanSumOp = paymentPlans.stream().filter(c -> Objects.nonNull(c.getPaymentTime()) && (c.getPaymentTime().getYear() - projectYear) < 0) - .mapToDouble(c -> Objects.nonNull(c.getActualPaymentAmount()) ? c.getActualPaymentAmount().doubleValue() : 0.0) - .sum(); - Double maxAmount = planSum - actualPlanSum; - VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.valueOf(maxAmount)) > 0).throwMessage("所填年度支付金额 超出 最大限额"); + .map(c -> Objects.nonNull(c.getActualPaymentAmount()) ? c.getActualPaymentAmount() : BigDecimal.ZERO) + .reduce(BigDecimal::add); + if(actualPlanSumOp.isPresent()){ + actualPlanSum = actualPlanSumOp.get(); + } + BigDecimal maxAmount = planSum.subtract(actualPlanSum); + VUtils.isTrue(annualPlanAmount.compareTo(maxAmount) > 0).throwMessage("所填年度支付金额 超出 最大限额"); }