From 27555c83f68c8d4bd36a96d40298300476c56ea7 Mon Sep 17 00:00:00 2001 From: RuicyWu <1063154311@qq.com> Date: Fri, 10 Jan 2025 09:32:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9C=E9=83=BD=E5=9F=8E=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=20=E8=A1=A5=E5=85=85=E5=A2=9E=E5=8A=A0=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datamap/AbstractAssetDataMapMode.java | 1 + .../src_ydctdatasync/datamap/AbstractFeeDataMapMode.java | 1 + .../apps/src_ydctdatasync/datamap/ContractBillMode.java | 9 +++++++++ .../apps/src_ydctdatasync/datamap/GzcfAssetMode.java | 1 - .../apps/src_ydctdatasync/datamap/GzfwAssetMode.java | 1 - .../apps/src_ydctdatasync/datamap/GztdAssetMode.java | 1 - .../datamap/HydropowerRechargeDataMapMode.java | 2 +- .../apps/src_ydctdatasync/quartz/YdzbDataSyncQuartz.java | 6 +++--- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractAssetDataMapMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractAssetDataMapMode.java index 9ae8a8c..baf2e7c 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractAssetDataMapMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractAssetDataMapMode.java @@ -80,6 +80,7 @@ public abstract class AbstractAssetDataMapMode extends AbstractDataMapMode{ targetMap.put("数公基19位编码",sourceMap.get("sgjbm"));//填充数公基19位编码 targetMap.put("账面价值",sourceMap.get("paper_value"));//填充账面价值 targetMap.put("租赁基准价格",sourceMap.get("rent_benchmark"));//填充租赁基准价格 + targetMap.put("坐落位置",sourceMap.get("located_street"));//填充坐落位置 // targetMap.put("field0061",sourceMap.get(""));//填充管理单位编号 } diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractFeeDataMapMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractFeeDataMapMode.java index 7dce388..fcb1785 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractFeeDataMapMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/AbstractFeeDataMapMode.java @@ -35,6 +35,7 @@ public abstract class AbstractFeeDataMapMode extends AbstractDataMapMode{ targetMap.put("住保-单元",sourceMap.get("unit_name")); //填充单元 targetMap.put("住保-房号",sourceMap.get("house_number")); //填充房号 targetMap.put("住保-租户联系方式",sourceMap.get("tenant_phone_number")); //填充租户联系方式 + targetMap.put("订单描述说明",sourceMap.get("recharge_desc")); //填充订单说明 targetMap.put("OA付款单位","默认宜都市住保运营管理有限公司"); //填充OA付款单位，默认宜都市住保运营管理有限公司 targetMap.put("OA收款单位","默认宜都市住保运营管理有限公司"); //填充OA收款单位，默认宜都市住保运营管理有限公司 } diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/ContractBillMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/ContractBillMode.java index 238b666..c6b0dd9 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/ContractBillMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/ContractBillMode.java @@ -3,6 +3,9 @@ package com.seeyon.apps.src_ydctdatasync.datamap; import com.seeyon.apps.src_ydctdatasync.utils.EnumMapUtils; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Map; import java.util.function.Function; @@ -32,12 +35,18 @@ public class ContractBillMode extends AbstractFeeDataMapMode{ commonAttrTransfer(target,source); Map targetMap = (Map) target; Map sourceMap = (Map) source; + DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); targetMap.put("是否入账",sourceMap.get("recordBill")); //填充是否入账 targetMap.put("收支类型",sourceMap.get("incomeOrCost")); //填充收支类型 targetMap.put("住保-费用类型",sourceMap.get("bill_type")); //填充费用类型 targetMap.put("主键",sourceMap.get("bill_id")); //主键 targetMap.put("应收金额",sourceMap.get("bill_amount")); //填充应收金额 targetMap.put("本次实收金额",sourceMap.get("bill_amount")); //填充本次实收金额 + try { + targetMap.put("住保-账单生成日期",df.format(sourceMap.get("trade_reconciliation_time"))); //填充账单生成日期 + }catch (NullPointerException e) { + + } } } diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzcfAssetMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzcfAssetMode.java index a14506a..4e9699a 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzcfAssetMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzcfAssetMode.java @@ -38,7 +38,6 @@ public class GzcfAssetMode extends AbstractAssetDataMapMode{ Map sourceMap = (Map) source; targetMap.put("资产类型",sourceMap.get("zcTypeFwValue"));//填充资产类型 targetMap.put("资产二级类型",sourceMap.get("zcTypeLevel2"));//填充资产二级类型 - targetMap.put("坐落位置",sourceMap.get("located_street"));//填充坐落位置 targetMap.put("有无电梯",sourceMap.get("has_lift"));//填充有无电梯 targetMap.put("用途",sourceMap.get("house_use"));//填充房屋用途 diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzfwAssetMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzfwAssetMode.java index a11ed9b..e68819b 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzfwAssetMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GzfwAssetMode.java @@ -43,7 +43,6 @@ public class GzfwAssetMode extends AbstractAssetDataMapMode{ targetMap.put("资产二级类型",sourceMap.get("zcTypeLevel2"));//填充资产二级类型 targetMap.put("资产种类",sourceMap.get("variable_002"));//填充资产种类 targetMap.put("楼栋",sourceMap.get("variable_001"));//填充楼栋 - targetMap.put("坐落位置",sourceMap.get("located_street"));//填充坐落位置 targetMap.put("有无电梯",sourceMap.get("has_lift"));//填充有无电梯 targetMap.put("用途",sourceMap.get("house_use"));//填充房屋用途 diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GztdAssetMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GztdAssetMode.java index bff09f1..c0d2edc 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GztdAssetMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/GztdAssetMode.java @@ -36,7 +36,6 @@ public class GztdAssetMode extends AbstractAssetDataMapMode{ Map sourceMap = (Map) source; targetMap.put("资产类型",sourceMap.get("zcTypeFwValue"));//填充资产类型 targetMap.put("资产二级类型",sourceMap.get("zcTypeLevel2"));//填充资产二级类型 - targetMap.put("坐落位置",sourceMap.get("located_street"));//填充坐落位置 targetMap.put("土地性质",sourceMap.get("land_nature"));//填充土地性质 // targetMap.put("field0079",sourceMap.get(""));//填充资产所属单位 // targetMap.put("field0062",sourceMap.get(""));//填充管理单位 diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/HydropowerRechargeDataMapMode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/HydropowerRechargeDataMapMode.java index 46c5cd2..fd7fd9f 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/HydropowerRechargeDataMapMode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/datamap/HydropowerRechargeDataMapMode.java @@ -46,7 +46,7 @@ public class HydropowerRechargeDataMapMode extends AbstractFeeDataMapMode{ } targetMap.put("住保-费用类型","水电费"); //填充费用类型 targetMap.put("住保-支付订单状态",sourceMap.get("recharge_status")); //填充订单状态 - targetMap.put("订单描述说明",sourceMap.get("recharge_desc")); //填充订单说明 + } } diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/quartz/YdzbDataSyncQuartz.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/quartz/YdzbDataSyncQuartz.java index 9948b4a..d0906e3 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/quartz/YdzbDataSyncQuartz.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctdatasync/quartz/YdzbDataSyncQuartz.java @@ -152,12 +152,12 @@ public class YdzbDataSyncQuartz extends AbstractQuartzTask implements Disposable //处理合同费用 private void processContractBillData(Connection connection,Date startDate,Date endDate) throws SQLException, BusinessException, ServiceException { log.info("开始同步合同费用数据"); - String countQuerySql = "SELECT count(*) FROM zb_contract_bill where;"; + String countQuerySql = "SELECT count(*) FROM zb_contract_bill where trade_reconciliation_time >= ? and trade_reconciliation_time <= ?;"; String pageQuerySql = "SELECT * FROM zb_contract_bill where limit 100 OFFSET ?;"; ContractBillMode contractBillMode = new ContractBillMode(); contractBillMode.setAgent(agent); contractBillMode.setCwRootPcode(getBizConfigByKey(YdzbdataSyncConstants.cwRootEnumPCode)); - long count = StatementQueryUtil.queryCount(countQuerySql,connection,null); + long count = StatementQueryUtil.queryCount(countQuerySql,connection,startDate,endDate); int totalPage = (int)Math.ceil((double)count / 100); for(int i = 0; i < totalPage;i++) { List> gztdDataList = StatementQueryUtil.queryList(pageQuerySql, connection, i*100); @@ -165,7 +165,7 @@ public class YdzbDataSyncQuartz extends AbstractQuartzTask implements Disposable Map targetMap = new HashMap<>(); contractBillMode.preProcess(rowMap); contractBillMode.transfer(targetMap,rowMap); - + insertData(getBizConfigByKey(YdzbdataSyncConstants.feeFormNo),convert2StringValue(targetMap)); } } log.info("合同费用数据同步完成");