diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java index 576213f7..b57e8ed1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java @@ -98,7 +98,8 @@ public class TbsBudgetMatchApplication { //不是回退和异动,需要过滤停用条件 if(!costApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())&& !costApply.getChargeState().equals(TbsCostApplyState.State_7_changed.getCode())){ - if(budget.getStopFlag().equals(1)){ + //跨年和不运作状态时跳过 + if(budget.getStopFlag().equals(1)||budget.getInactiveFlag().equals(1)){ continue; } } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index b36022f4..69c94095 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -673,6 +673,8 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ ); budgetLqw.in(TbsBudget::getCenterId,centerIds); budgetLqw.eq(TbsBudget::getBudgetState,1); + budgetLqw.eq(TbsBudget::getStopFlag,0); + budgetLqw.eq(TbsBudget::getInactiveFlag,0); budgetLqw.eq(TbsBudget::getTemplateFlag,0); budgetList = tbsBudgetMapper.selectList(budgetLqw); }else {