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 ServiceImplplan:{}", 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 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 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 result = new HashMap<>();