diff --git a/src/main/java/com/demo/Application.java b/src/main/java/com/demo/Application.java index 676a493..02ae437 100644 --- a/src/main/java/com/demo/Application.java +++ b/src/main/java/com/demo/Application.java @@ -27,7 +27,7 @@ public class Application { Integer m = Integer.parseInt(month); TbsServiceImpl service = new TbsServiceImpl(); -// service.removeYiDong(); //移除异动 + //service.removeYiDong(); //移除异动 //费用申请 for (int i = 1; i < 13; i++) { @@ -35,30 +35,27 @@ public class Application { } //特殊的命中修改成本中心 -// SyncMatchActCenter matchActCenter = new SyncMatchActCenter(); -// matchActCenter.tmain(); + SyncMatchActCenter matchActCenter = new SyncMatchActCenter(); + matchActCenter.tmain(); -// 预算匹配 - new TbsMatchServiceImpl().matchBudget(); - - //TODO 根据活动编码，更新申请vtb_flag=1，重新录入核销 -// SyncActVtb actVtb = new SyncActVtb(); -// actVtb.tmain(); + //更新申请vtb_flag=1，重新录入核销，并非每次执行 + new SyncActVtb().tmain(); + new TbsMatchServiceImpl().matchBudget(); //费用核销 SyncVerificationMain verificationMain = new SyncVerificationMain(); verificationMain.testMain(); //更新核销中的预算费用占用 - SyncDiscountBudget syncDiscountBudget = new SyncDiscountBudget(); - syncDiscountBudget.sync();; + new SyncDiscountBudget().sync(); //更新申请和活动的状态 new TbsMatchServiceImpl().updateStatus(); //同步isCancel=1的费用释放 new SyncNotCheckMain().doMain(); + } diff --git a/src/main/java/com/demo/Application2.java b/src/main/java/com/demo/Application2.java index 794e8f2..4ab18c3 100644 --- a/src/main/java/com/demo/Application2.java +++ b/src/main/java/com/demo/Application2.java @@ -13,139 +13,8 @@ import org.junit.Test; public class Application2 { @Test - public void test1000(){ - SetData.startId = 0; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test2000(){ - SetData.startId = 1000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test3000(){ - SetData.startId = 2000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test4000(){ - SetData.startId = 3000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test5000(){ - SetData.startId = 4000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test6000(){ - SetData.startId = 5000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test7000(){ - SetData.startId = 6000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test8000(){ - SetData.startId = 7000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test9000(){ - SetData.startId = 8000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test10000(){ - SetData.startId = 9000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } + public void test1(){ - @Test - public void test11000(){ - SetData.startId = 10000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test12000(){ - SetData.startId = 11000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - - //////////////////////////////// - - @Test - public void test13000(){ - SetData.startId = 12000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test14000(){ - SetData.startId = 13000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test15000(){ - SetData.startId = 14000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test16000(){ - SetData.startId = 15000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test17000(){ - SetData.startId = 16000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test18000(){ - SetData.startId = 17000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); - } - - @Test - public void test19000(){ - SetData.startId = 18000; - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); } } diff --git a/src/main/java/com/demo/SyncActVtb.java b/src/main/java/com/demo/SyncActVtb.java index 155291d..cb33140 100644 --- a/src/main/java/com/demo/SyncActVtb.java +++ b/src/main/java/com/demo/SyncActVtb.java @@ -2,6 +2,7 @@ package com.demo; import com.demo.cost.TbsMapper; import lombok.SneakyThrows; +import org.junit.Test; import org.noear.wood.DbContext; import java.util.List; @@ -12,14 +13,27 @@ import java.util.List; **/ public class SyncActVtb { + @Test @SneakyThrows public void tmain(){ + DbContext xltDbContext = TbsMapper.getXltDbContext(); DbContext jslDbContext = TbsMapper.getJslDbContext(); - List activityCodes = null; - String sql_update = "update tbs_cost_apply left join tbs_activity " + - "set tbs_cost_apply.vtb_sync = 1 " + - "where tbs_cost_apply.vtb_sync = 2 and " + - "tbs_activity.activity_code in "+SqlIdUtil.buildSqlIdString(activityCodes); + String date = "'2023-06-01'"; + String load_change_actCode = "select " + + "r1.number_ as cost_code " + + "from emp_tpmYiDongMsg e1 " + + "inner join Report r1 on e1.reportId = r1.ID " + + "where isGuiDang = 1 " + + "and r1.state = 70 " + + "and e1.yiDongShiJian> " +date+ + "and r1.archiveDate> " +date+ + "order by e1.yiDongShiJian desc"; + List costCodes = xltDbContext.sql(load_change_actCode).getArray("cost_code"); + + + String sql_update = "update tbs_cost_apply" + + " set tbs_cost_apply.vtb_sync = 1" + + " where tbs_cost_apply.vtb_sync = 2 and code in "+SqlIdUtil.buildSqlIdString(costCodes); jslDbContext.sql(sql_update).execute(); } diff --git a/src/main/java/com/demo/cost/SyncVerificationMain.java b/src/main/java/com/demo/cost/SyncVerificationMain.java index 1f09c2a..3723985 100644 --- a/src/main/java/com/demo/cost/SyncVerificationMain.java +++ b/src/main/java/com/demo/cost/SyncVerificationMain.java @@ -398,6 +398,7 @@ public class SyncVerificationMain { verificationSubject.setSupplierCode(tbsActivity.getSupplierCode()); verificationSubject.setUsedAmountRecord(checkApplyCostAmt); verificationSubject.setUsedAmount(checkCostAmt); + verificationSubject.setPayAmount(checkCostAmt); verificationSubject.setCountPerson(0); verificationSubject.setCountSession(0); verificationSubject.setTenantId("001"); diff --git a/src/main/java/com/demo/cost/TbsMapper.java b/src/main/java/com/demo/cost/TbsMapper.java index 0b29731..14b7d27 100644 --- a/src/main/java/com/demo/cost/TbsMapper.java +++ b/src/main/java/com/demo/cost/TbsMapper.java @@ -16,7 +16,7 @@ public class TbsMapper { public static DbContext getJslDbContext() { if (jslCtx == null) { jslCtx = new DbContext("test", - "jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev2?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true", + "jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev07?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true", "kpjsl", "123456"); // jslCtx = new DbContext("pro", diff --git a/src/main/java/com/demo/cost/TbsServiceImpl.java b/src/main/java/com/demo/cost/TbsServiceImpl.java index 01ee2e5..c0adff3 100644 --- a/src/main/java/com/demo/cost/TbsServiceImpl.java +++ b/src/main/java/com/demo/cost/TbsServiceImpl.java @@ -544,9 +544,8 @@ public class TbsServiceImpl { break; } } - if(exist){ + if(!exist){ activityCenter.setCenterType("customer"); - activityCenter.setTenantId("001"); activityCenter.setCenterCode(costItem.getCenterCode()); activityCenter.setCenterName(costItem.getCenterName()); if(saleRegion!=null&&!"0".equals(saleRegion.getId())){ @@ -563,6 +562,7 @@ public class TbsServiceImpl { //activityCenter.setUsedAmount(totalCheckMoney); activityCenter.setUsedAmount(BigDecimal.ZERO); activityCenter.setRemark(costItem.getProductRemark()); + activityCenter.setTenantId("001"); jslContext.table("tbs_activity_center").setEntity(activityCenter).insert(); }