审批过程中和合同资金重复bug

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("合同实际金额大于计划金额！请重新填写合同信息 ");
                             }
                         }
 

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::getFlag, taskName.equals("合同签订") ? "计划" : "实际");
-                    .eq(HuzhouContractinfo::getTaskName, taskName);
+                    //.eq(HuzhouContractinfo::getTaskName, taskName);
             // 3.查询数据库中符合条件的合同信息
             List<HuzhouContractinfo> dbList = contractinfoService.list(qw);
 

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<>();