From 20f4a05ee53db8ec4a401d749e8a5e78300cbd0c Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 17 Mar 2023 09:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=91=E9=A2=9D=20?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/DefaultDeclaredProjectManage.java       | 23 ++++++++++++----------
 .../task/CheckProvincialReviewResultTask.java      |  6 +++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
index 34ad67b..b225a2b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
@@ -86,16 +86,19 @@ public class DefaultDeclaredProjectManage {
         VUtils.isTrue(declareAmount.compareTo(totalAmount) != 0)
                 .throwMessage(String.format("申报失败! 申报总金额【{}】 不等于其它申报金额 【{}】",declareAmount,totalAmount));
 
-        BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount();
-        BigDecimal annualGovSuperAmount = projectInfo.getAnnualPlanGovSuperiorFinanceAmount();
-        BigDecimal annualOwnSuperAmount = projectInfo.getAnnualPlanGovOwnFinanceAmount();
-        BigDecimal annualBankLendingAmount = projectInfo.getAnnualPlanBankLendingAmount();
-        BigDecimal annualHaveAmount = projectInfo.getAnnualPlanHaveAmount();
-        BigDecimal anualOtherAmount = projectInfo.getAnnualPlanOtherAmount();
-        BigDecimal totalAnnual = annualGovSuperAmount
-                .add(annualOwnSuperAmount).add(annualBankLendingAmount).add(annualHaveAmount).add(anualOtherAmount);
-        VUtils.isTrue(annualPlanAmount.compareTo(totalAnnual) != 0)
-                .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不等于其它年度支付金额 【{}】",annualPlanAmount,totalAnnual));
+        //判断 年度计划金额 如果开着的话
+        if(projectInfo.getIsAnnualPlanAmount()){
+            BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount();
+            BigDecimal annualGovSuperAmount = projectInfo.getAnnualPlanGovSuperiorFinanceAmount();
+            BigDecimal annualOwnSuperAmount = projectInfo.getAnnualPlanGovOwnFinanceAmount();
+            BigDecimal annualBankLendingAmount = projectInfo.getAnnualPlanBankLendingAmount();
+            BigDecimal annualHaveAmount = projectInfo.getAnnualPlanHaveAmount();
+            BigDecimal anualOtherAmount = projectInfo.getAnnualPlanOtherAmount();
+            BigDecimal totalAnnual = annualGovSuperAmount
+                    .add(annualOwnSuperAmount).add(annualBankLendingAmount).add(annualHaveAmount).add(anualOtherAmount);
+            VUtils.isTrue(annualPlanAmount.compareTo(totalAnnual) != 0)
+                    .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不等于其它年度支付金额 【{}】",annualPlanAmount,totalAnnual));
+        }
     }
 
     public ProcessInstanceUserDto buildUser(Long userId){
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java
index 3542bbe..b10e960 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java
@@ -39,14 +39,14 @@ public class CheckProvincialReviewResultTask {
     private final IProjectService projectService;
     private final StateMachineUtils stateMachineUtils;
 
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 */1 * * * ?")
     public void statusFlow() throws UnknownHostException {
         //测试暂时用自己电脑HOST
         if (TaskContant.Host.HOST_ZPF.equals(InetAddress.getLocalHost().getHostName())) {
             //1. 定时取 省级部门联审中的项目 去取项目
             List<Project> projectList = projectService.list(Wrappers.lambdaQuery(Project.class)
-                            .eq(Project::getStage, ProjectStatusEnum.NOT_APPROVED)
-                            .eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS)
+                            .eq(Project::getStage, ProjectStatusEnum.NOT_APPROVED.getCode())
+                            .eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode())
                             .orderByAsc(Project::getCreateOn));
 
             log.info("需要去查询省级联审结果的项目 size:{}",projectList.size());