From 55bd4e097afbcefbdc7c8910dcb60148ea26c198 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 17 Jul 2023 15:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AEBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/demo/SyncDiscountBudget.java | 2 ++ src/main/java/com/demo/cost/SyncVerificationMain.java | 4 ++-- src/main/java/com/demo/cost/TbsMatchServiceImpl.java | 2 +- src/main/java/com/demo/t20230704/SyncNotCheckMain.java | 7 +++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/demo/SyncDiscountBudget.java b/src/main/java/com/demo/SyncDiscountBudget.java index d8049ff..f9bb81e 100644 --- a/src/main/java/com/demo/SyncDiscountBudget.java +++ b/src/main/java/com/demo/SyncDiscountBudget.java @@ -81,6 +81,8 @@ public class SyncDiscountBudget { System.out.println("-------"); continue; } + +// System.out.println(itemBudget.getBudgetCode()); JslTbsBudgetLog budgetLog = new JslTbsBudgetLog(); budgetLog.setBudgetId(itemBudget.getBudgetId()); budgetLog.setBudgetCode(itemBudget.getBudgetCode()); diff --git a/src/main/java/com/demo/cost/SyncVerificationMain.java b/src/main/java/com/demo/cost/SyncVerificationMain.java index 3723985..0d46bbf 100644 --- a/src/main/java/com/demo/cost/SyncVerificationMain.java +++ b/src/main/java/com/demo/cost/SyncVerificationMain.java @@ -342,8 +342,8 @@ public class SyncVerificationMain { verification.setAmountRecord(checkApplyCostAmt); verification.setTenantId("001"); verification.setSupplierId(tbsActivity.getSupplierId()); - verification.setSupplierName(tbsActivity.getSupplierCode()); - verification.setSupplierCode(tbsActivity.getSupplierName()); + verification.setSupplierName(tbsActivity.getSupplierName()); + verification.setSupplierCode(tbsActivity.getSupplierCode()); verification.setUserId("0"); verification.setUserCode("0"); verification.setUserName("数据导入"); diff --git a/src/main/java/com/demo/cost/TbsMatchServiceImpl.java b/src/main/java/com/demo/cost/TbsMatchServiceImpl.java index 6f6e15e..04606f0 100644 --- a/src/main/java/com/demo/cost/TbsMatchServiceImpl.java +++ b/src/main/java/com/demo/cost/TbsMatchServiceImpl.java @@ -63,7 +63,7 @@ public class TbsMatchServiceImpl { String updateSql3 = "UPDATE tbs_activity_center_goods g SET g.sync_budget = 1 where g.center_amount = 0"; - String updateSql4 = "UPDATE tbs_cost_apply a SET a.new_budget_sync = 0 where a.budget_sync = 0"; + String updateSql4 = "UPDATE tbs_cost_apply a SET a.new_budget_sync = 0 where a.budget_sync = 0 and a.xlt_sync=2"; String updateSql5 = "UPDATE tbs_cost_apply AS a " + "LEFT JOIN tbs_activity_center_goods AS g ON a.id = g.cost_apply_id " + "SET a.new_budget_sync = 3 " + diff --git a/src/main/java/com/demo/t20230704/SyncNotCheckMain.java b/src/main/java/com/demo/t20230704/SyncNotCheckMain.java index acf826d..6fa6537 100644 --- a/src/main/java/com/demo/t20230704/SyncNotCheckMain.java +++ b/src/main/java/com/demo/t20230704/SyncNotCheckMain.java @@ -57,6 +57,8 @@ public class SyncNotCheckMain { String del_budget_log = "delete from tbs_budget_log where remark = 'byCancel_1' and activity_id = ?"; + String sql_find_activity_release = "SELECT * FROM `vtb_fund_flow` where activity_id = ? and fund_type = 'release'"; + @Test @SneakyThrows public void doMain(){ @@ -85,6 +87,11 @@ public class SyncNotCheckMain { return; } + if(jslDbContext.sql(sql_find_activity_release, tbsActivity.getId()).getCount()>0){ + System.out.println("已释放该活动费用："+ tbsActivity.getCostCode()); + return; + } + //删除历史记录 jslDbContext.sql(del_fund_flow,tbsActivity.getId()).execute(); jslDbContext.sql(del_budget_log,tbsActivity.getId()).execute();