From 0bb3f5edfe69521f8de8cb2561572e522f07dc95 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 14 Aug 2023 07:11:22 +0800 Subject: [PATCH] 2022 --- src/main/java/com/demo/Application.java | 16 ++--- .../java/com/demo/cost/TbsServiceImpl.java | 65 ++++++++++--------- .../demo/t202307042/CenterUserNameXlt.java | 25 ++++--- 3 files changed, 60 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/demo/Application.java b/src/main/java/com/demo/Application.java index 9a1ad5d..a6bd685 100644 --- a/src/main/java/com/demo/Application.java +++ b/src/main/java/com/demo/Application.java @@ -19,20 +19,20 @@ import lombok.extern.slf4j.Slf4j; public class Application { public static void main(String[] args) { - String ymString = "202307"; + String ymString = "202212"; //String ymString = System.getProperty("startId"); String year = ymString.substring(0,4); String month = ymString.substring(4,6); Integer y = Integer.parseInt(year); Integer m = Integer.parseInt(month); -// TbsServiceImpl service = new TbsServiceImpl(); + TbsServiceImpl service = new TbsServiceImpl(); // service.removeYiDong(); //移除异动 // // //费用申请 -// for (int i = 1; i < 13; i++) { -// service.syncCost(y,i); -// } + for (int i = 1; i < 13; i++) { + service.syncCost(y,i); + } // // //特殊的命中修改成本中心 // SyncMatchActCenter matchActCenter = new SyncMatchActCenter(); @@ -44,8 +44,8 @@ public class Application { // new TbsMatchServiceImpl().matchBudget(); // //费用核销 - SyncVerificationMain verificationMain = new SyncVerificationMain(); - verificationMain.testMain(); +// SyncVerificationMain verificationMain = new SyncVerificationMain(); +// verificationMain.testMain(); // // //更新核销中的预算费用占用 // new SyncDiscountBudget().sync(); @@ -53,7 +53,7 @@ public class Application { // 更新申请和活动的状态 // 同步isCancel=1的费用释放 - new SyncNotCheckMain().doMain(); +// new SyncNotCheckMain().doMain(); // new TbsMatchServiceImpl().updateStatus(); diff --git a/src/main/java/com/demo/cost/TbsServiceImpl.java b/src/main/java/com/demo/cost/TbsServiceImpl.java index 732e918..9fac011 100644 --- a/src/main/java/com/demo/cost/TbsServiceImpl.java +++ b/src/main/java/com/demo/cost/TbsServiceImpl.java @@ -130,7 +130,9 @@ public class TbsServiceImpl { log.info(year + "年" + month + "月无数据"); return; } - List centerUserNameList = jslContext.sql("select * from center_user_name_xlt ").getList(CenterUserNameXlt.class); + List centerUserNameList = xltContext.sql("select chengBenId as cheng_ben_id,chengBenName as cheng_ben_name,chengBenCode as cheng_ben_code, " + + " centerType as center_type,centerId as center_id,centerCode as center_code,centerName as center_name " + + " from mindb.dbo.CostCenterReflect where centerId is not null").getList(CenterUserNameXlt.class); List> listList = CollectionUtil.createList(allCostList, 2000); List costList = new ArrayList<>(); for (List xltCostList : listList) { @@ -455,7 +457,6 @@ public class TbsServiceImpl { centerGoods.setSubjectId(jslSubject.getId()); centerGoods.setCenterAmount(costItem.getMoney()); centerGoods.setCenterRate(new BigDecimal("100")); - centerGoods.setCenterType("customer"); centerGoods.setTenantId("001"); centerGoods.setSupplierId(supplierId); centerGoods.setSupplierCode(costItem.getCusCode()); @@ -463,24 +464,29 @@ public class TbsServiceImpl { //设置成本中心 String xltCenterCode = costItem.getCenterCode(); + String xltCenterId = costItem.getCenterId(); for (CenterUserNameXlt nameXlt : centerUserNameList) { - if(nameXlt.getCenterUserName().equals(xltCenterCode)){ - centerGoods.setCenterType(nameXlt.getType()); - centerGoods.setCenterId(nameXlt.getCmsCenterId()); - centerGoods.setCenterName(nameXlt.getCmsCenterName()); - centerGoods.setCenterCode(nameXlt.getCmsCenterCode()); + if(nameXlt.getChengBenId().equals(xltCenterId)){ + centerGoods.setCenterType(nameXlt.getCenterType()); + centerGoods.setCenterId(nameXlt.getCenterId()); + centerGoods.setCenterName(nameXlt.getCenterName()); + centerGoods.setCenterCode(nameXlt.getCenterCode()); break; } } if(centerGoods.getCenterName()==null){ - if(saleRegion!=null&&!"0".equals(saleRegion.getId())){ - centerGoods.setCenterType("saleRegion"); - centerGoods.setCenterId(saleRegion.getId()); - centerGoods.setCenterName(saleRegion.getName()); - centerGoods.setCenterCode(saleRegion.getCode()); - }else { - centerGoods.setCenterId("__"+supplierId); - } + centerGoods.setCenterType("customer"); + centerGoods.setCenterId(""+supplierId); + centerGoods.setCenterCode(costItem.getCenterCode()); + centerGoods.setCenterName(costItem.getCenterName()); +// if(saleRegion!=null&&!"0".equals(saleRegion.getId())){ +// centerGoods.setCenterType("saleRegion"); +// centerGoods.setCenterId(saleRegion.getId()); +// centerGoods.setCenterName(saleRegion.getName()); +// centerGoods.setCenterCode(saleRegion.getCode()); +// }else { +// centerGoods.setCenterId("__"+supplierId); +// } } //todo 同步核销时更新 @@ -537,13 +543,13 @@ public class TbsServiceImpl { String xltCenterCode = costItem.getCenterCode(); boolean exist = false; + String xltCenterId = costItem.getCenterId(); for (CenterUserNameXlt nameXlt : centerUserNameList) { - if(nameXlt.getCenterUserName().equals(xltCenterCode)){ - activityCenter.setCenterType(nameXlt.getType()); - activityCenter.setCenterId(nameXlt.getCmsCenterId()); - activityCenter.setCenterName(nameXlt.getCmsCenterName()); - activityCenter.setCenterCode(nameXlt.getCmsCenterCode()); - exist = true; + if(nameXlt.getChengBenId().equals(xltCenterId)){ + activityCenter.setCenterType(nameXlt.getCenterType()); + activityCenter.setCenterId(nameXlt.getCenterId()); + activityCenter.setCenterName(nameXlt.getCenterName()); + activityCenter.setCenterCode(nameXlt.getCenterCode()); break; } } @@ -551,14 +557,15 @@ public class TbsServiceImpl { activityCenter.setCenterType("customer"); activityCenter.setCenterCode(costItem.getCenterCode()); activityCenter.setCenterName(costItem.getCenterName()); - if(saleRegion!=null&&!"0".equals(saleRegion.getId())){ - activityCenter.setCenterType("saleRegion"); - activityCenter.setCenterId(saleRegion.getId()); - activityCenter.setCenterName(saleRegion.getName()); - activityCenter.setCenterCode(saleRegion.getCode()); - }else { - activityCenter.setCenterId("__"+supplierId); - } + activityCenter.setCenterId(""+supplierId); + +// if(saleRegion!=null&&!"0".equals(saleRegion.getId())){ +// activityCenter.setCenterType("saleRegion"); +// activityCenter.setCenterId(saleRegion.getId()); +// activityCenter.setCenterName(saleRegion.getName()); +// activityCenter.setCenterCode(saleRegion.getCode()); +// }else { +// } } //todo 同步时更新 diff --git a/src/main/java/com/demo/t202307042/CenterUserNameXlt.java b/src/main/java/com/demo/t202307042/CenterUserNameXlt.java index fba305e..e01ba07 100644 --- a/src/main/java/com/demo/t202307042/CenterUserNameXlt.java +++ b/src/main/java/com/demo/t202307042/CenterUserNameXlt.java @@ -9,14 +9,21 @@ import lombok.Data; @Data public class CenterUserNameXlt { - String centerId; - - String centerUserName; - - String cmsCenterId; - String cmsCenterCode; - String cmsCenterName; - - String type; +// String centerId; +// +// String centerUserName; +// +// String cmsCenterId; +// String cmsCenterCode; +// String cmsCenterName; +// +// String type; + String chengBenId; + String chengBenName; + String chengBenCode; + String centerType; + String centerId; + String centerCode; + String centerName; }