From f0ddd43df7293572ae7029643850beb2a338c4ef Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Thu, 17 Apr 2025 13:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=BF=87=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=E5=92=8C=E5=90=88=E5=90=8C=E8=B5=84=E9=87=91=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/service/impl/HuzhouContractinfoServiceImpl.java    | 2 +-
 .../huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java    | 4 ++--
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
index 7169d7f..34e75d0 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
@@ -527,7 +527,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
                             Double PlanTotalMoney = planContract.getTotalMoney();
                             log.info("real:{}--->plan:{}", RealTotalMoney, PlanTotalMoney);
                             if (RealTotalMoney > PlanTotalMoney) {
-                                throw new EasyException("合同实际金额大于计划金额！请重新填写合同信息 ");
+                                //throw new EasyException("合同实际金额大于计划金额！请重新填写合同信息 ");
                             }
                         }
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
index efc832d..2143b33 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
@@ -611,8 +611,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             // 2.封装条件
             LambdaQueryWrapper<HuzhouContractinfo> qw = new LambdaQueryWrapper<>();
             qw.eq(HuzhouContractinfo::getProjectId, contractList.get(0).getProjectId())
-                    .eq(HuzhouContractinfo::getFlag, taskName.equals("合同签订") ? "计划" : "实际")
-                    .eq(HuzhouContractinfo::getTaskName, taskName);
+                    .eq(HuzhouContractinfo::getFlag, taskName.equals("合同签订") ? "计划" : "实际");
+                    //.eq(HuzhouContractinfo::getTaskName, taskName);
             // 3.查询数据库中符合条件的合同信息
             List<HuzhouContractinfo> dbList = contractinfoService.list(qw);
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 44f1bf2..9b9389e 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -2968,7 +2968,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             Double currentProvincialMoney = huzhouContractinfo.getProvincialMoney();
             centralMoney += (currentCentralMoney != null) ? currentCentralMoney : 0.0;
             provincialMoney += (currentProvincialMoney != null) ? currentProvincialMoney : 0.0;
-            log.info("查询到{}:中央资金{},省级资金{}", huzhouContractinfo.getTaskName(), currentCentralMoney, currentProvincialMoney);
+            log.info("查询到阶段:{} 中央资金:{} 省级资金:{}", huzhouContractinfo.getTaskName(), currentCentralMoney, currentProvincialMoney);
         }
 
         Map<String, Double> result = new HashMap<>();