From ff8e70c081c8c5e9d3c11bf24fca68b44e2b0241 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 9 Jul 2024 10:23:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=90=E4=BD=9C=E7=8A=B6=E6=80=81,=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=92=8C=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/tbs/service/TbsBudgetMatchApplication.java   | 3 ++-
 .../tzc/service/impl/TzcPolicyApplicationServiceImpl.java      | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 {