From 1a7d6964d1f0a873e47adf13b844d39a3bfac14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 30 May 2025 14:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=EF=BC=88kh?=
 =?UTF-8?q?mc=EF=BC=89=E4=BC=9A=E6=9C=89=E9=87=8D=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=EF=BC=8C=E6=89=80=E4=BB=A5=E5=8C=B9=E9=85=8D=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81=E5=B0=86uf=5Fjnzhmx?=
 =?UTF-8?q?=E5=92=8C=E7=A5=A8=E6=8D=AE=E6=98=8E=E7=BB=86uf=5Fpjskmx?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=A0=B9=E6=8D=AE=E6=94=B6=E6=AC=BE=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=EF=BC=88skgs=EF=BC=89=E3=80=81=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=88hkr=EF=BC=89=E5=8E=BB=E5=8C=B9=E9=85=8Duf=5Fh?=
 =?UTF-8?q?krdzb=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=85=AC=E5=8F=B8=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=EF=BC=88gsbm=EF=BC=89=E5=92=8C=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=88khmc=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/CBS2ECConfig.xml                      |  2 ++
 .../engine/salary/timer/SyncCBSAccountDetailsJob.java  | 10 ++++++++--
 src/com/engine/salary/timer/SyncCBSPayDetailsJob.java  | 10 ++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/resource/WEB-INF/CBS2ECConfig.xml b/resource/WEB-INF/CBS2ECConfig.xml
index e6bde94..67463cb 100644
--- a/resource/WEB-INF/CBS2ECConfig.xml
+++ b/resource/WEB-INF/CBS2ECConfig.xml
@@ -7,6 +7,7 @@
         <field name="收款日期" key="skrq" ebsKey="bankTransactionDate"/>
         <field name="汇款人" key="hkr" ebsKey="unitName"/>
         <field name="对应客户" key="dykh" ebsKey="unitName"/>
+        <field name="收款公司" key="skgs" ebsKey="accountName"/>
         <field name="金额" key="je" ebsKey="incurredAmount"/>
     </table>
 
@@ -14,6 +15,7 @@
         <field name="收款日期" key="skrq" ebsKey="acceptorDate"/>
         <field name="汇款人" key="hkr" ebsKey="drawerName"/>
         <field name="对应客户" key="dykh" ebsKey="drawerName"/>
+        <field name="收款公司" key="skgs" ebsKey="holdOrganizationName"/>
         <field name="金额" key="je" ebsKey="billAmount"/>
         <field name="票据编号" key="pjbh" ebsKey="billNbr" unique="true"/>
         <field name="出票日期" key="cprq" ebsKey="issueDate"/>
diff --git a/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java b/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java
index e487961..1ddfb87 100644
--- a/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java
+++ b/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java
@@ -186,7 +186,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
 
             //鑾峰彇姹囨浜轰笌鍔炰簨澶勭殑瀵圭収鏁版嵁
             List<UfHkrdzbPO> ufHkrdzbPOS = getUfHkrdzbMapper().listAll();
-            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, UfHkrdzbPO::getKhmc);
+            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, p -> p.getGsbm() + "_" + p.getKhmc());
             List<DepartmentPO> departmentPOS = getUfHkrdzbMapper().listDepartment();
             Map<String, String> departmentMap = SalaryEntityUtil.convert2Map(departmentPOS, DepartmentPO::getCode, DepartmentPO::getId);
 
@@ -222,6 +222,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
                     add(String.format("'%s'", currTime));
                 }};
 
+                String skgs = "";
                 String hkr = "";
                 String je = "";
                 for (EBS2ECConfig.Table.Field field : table.getFields()) {
@@ -232,6 +233,11 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
                     String value = detailMap.getOrDefault(field.getEbsKey(), "");
                     values.add(String.format("'%s'", value));
 
+                    //鏀舵鍏徃
+                    if ("skgs".equals(fieldName)) {
+                        skgs = value;
+                    }
+
                     //姹囨浜�
                     if ("hkr".equals(fieldName)) {
                         hkr = value;
@@ -254,7 +260,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob {
                  * 濡傛灉鑳藉尮閰嶅埌鏁版嵁锛屽垯鐘舵�佹敼涓哄凡鑷姩璁ら锛屽悓鏃舵妸鍔炰簨澶勶紙閮ㄩ棬锛夌殑鍊煎悓姝ュ埌鍔炰簨澶勫瓧娈典腑锛屾槸鍚︾郴缁熻嚜鍔ㄨ棰嗗悓姝ヤ负鏄紱
                  * 濡傚鐓ф爣鍑嗘棤鏁版嵁锛屽垯鐘舵�佷负锛氭湭璁ら锛�
                  */
-                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(hkr);
+                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(skgs + "_" + hkr);
                 //甯佺涓嶆槸浜哄悕甯侊紝鍥介檯閮ㄨ棰�
                 String currency = detailMap.get("currency");
                 if (!"10".equals(currency)) {
diff --git a/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java b/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java
index d17ceeb..d496273 100644
--- a/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java
+++ b/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java
@@ -245,7 +245,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
 
             //鑾峰彇姹囨浜轰笌鍔炰簨澶勭殑瀵圭収鏁版嵁
             List<UfHkrdzbPO> ufHkrdzbPOS = getUfHkrdzbMapper().listAll();
-            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, UfHkrdzbPO::getKhmc);
+            Map<String, UfHkrdzbPO> customerDepartmentMap = SalaryEntityUtil.convert2Map(ufHkrdzbPOS, p -> p.getGsbm() + "_" + p.getKhmc());
             List<DepartmentPO> departmentPOS = getUfHkrdzbMapper().listDepartment();
             Map<String, String> departmentMap = SalaryEntityUtil.convert2Map(departmentPOS, DepartmentPO::getCode, DepartmentPO::getId);
 
@@ -280,6 +280,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
                     add(String.format("'%s'", currTime));
                 }};
 
+                String skgs = "";
                 String hkr = "";
                 String je = "";
                 for (EBS2ECConfig.Table.Field field : table.getFields()) {
@@ -290,6 +291,11 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
                     String value = detailMap.getOrDefault(field.getEbsKey(), "");
                     values.add(String.format("'%s'", value));
 
+                    //鏀舵鍏徃
+                    if ("skgs".equals(fieldName)) {
+                        skgs = value;
+                    }
+
                     //姹囨浜�
                     if ("hkr".equals(fieldName)) {
                         hkr = value;
@@ -312,7 +318,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob {
                  * 濡傛灉鑳藉尮閰嶅埌鏁版嵁锛屽垯鐘舵�佹敼涓哄凡鑷姩璁ら锛屽悓鏃舵妸鍔炰簨澶勶紙閮ㄩ棬锛夌殑鍊煎悓姝ュ埌鍔炰簨澶勫瓧娈典腑锛屾槸鍚︾郴缁熻嚜鍔ㄨ棰嗗悓姝ヤ负鏄紱
                  * 濡傚鐓ф爣鍑嗘棤鏁版嵁锛屽垯鐘舵�佷负锛氭湭璁ら锛�
                  */
-                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(hkr);
+                UfHkrdzbPO ufHkrdzbPO = customerDepartmentMap.get(skgs + "_" + hkr);
                 if (ufHkrdzbPO != null) {
 
                     //瀹㈡埛灞炴��