From 6e16c8853d6ed1bfc4bfcd409871161ed04e9d88 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 6 Jul 2023 10:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=9A=8F=E8=B4=A7=E6=8B=A6?= =?UTF-8?q?=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tzc/service/impl/TzcPolicyApplicationServiceImpl.java | 2 +- src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 3dc48fba..cc9c8606 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 @@ -414,7 +414,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ LambdaQueryWrapper budgetLqw = new LambdaQueryWrapper<>(); budgetLqw.in(TbsBudget::getId,budgetIds); //默认为随货折让(FYMC05) - budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05"); + //budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05"); budgetLqw.in(TbsBudget::getCenterId,centerIds); budgetLqw.eq(TbsBudget::getBudgetState,1); budgetList = tbsBudgetMapper.selectList(budgetLqw); diff --git a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml index b24ba01f..e9690e23 100644 --- a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml +++ b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml @@ -87,7 +87,7 @@ #{selectId} AND `tbs_cost_apply`.id != #{applyId} - AND opt_type IN (1,4,5,6,15) + AND opt_type != 0 group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id @@ -131,7 +131,7 @@ #{selectId} AND `tzc_policy`.id != #{policyId} - AND opt_type IN (11,12,13,14) + AND opt_type != 0 group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id