From 7346f020a0cb2315517cf8a4266c6c0bc20b948e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 10 Apr 2025 17:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=98=BE=E7=A4=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/CBS2ECConfig.xml             | 36 -------------------
 .../WEB-INF/prop/hrmSalaryCBS8.properties     |  6 ----
 .../service/impl/SIArchivesServiceImpl.java   |  4 +--
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 resource/WEB-INF/CBS2ECConfig.xml
 delete mode 100644 resource/WEB-INF/prop/hrmSalaryCBS8.properties

diff --git a/resource/WEB-INF/CBS2ECConfig.xml b/resource/WEB-INF/CBS2ECConfig.xml
deleted file mode 100644
index c817c1d8f..000000000
--- a/resource/WEB-INF/CBS2ECConfig.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="GB2312"?>
-
-<config name="CBS字段映射配置">
-
-    <table name="境内账户明细" key="uf_jnzhmx" modeId="10">
-        <field name="交易流水号" key="jylsh" ebsKey="transactionSerialNumber" unique="true"/>
-        <field name="收款日期" key="skrq" ebsKey="bankTransactionDate"/>
-        <field name="汇款人" key="hkr" ebsKey="unitName"/>
-        <field name="对应客户" key="dykh" ebsKey="unitName"/>
-        <field name="金额" key="je" ebsKey="incurredAmount"/>
-    </table>
-
-    <table name="票据收款明细" key="uf_pjskmx" modeId="11">
-        <field name="收款日期" key="skrq" ebsKey="acceptorDate"/>
-        <field name="汇款人" key="hkr" ebsKey="drawerName"/>
-        <field name="对应客户" key="dykh" ebsKey="drawerName"/>
-        <field name="金额" key="je" ebsKey="billAmount"/>
-        <field name="票据编号" key="pjbh" ebsKey="billNbr" unique="true"/>
-        <field name="出票日期" key="cprq" ebsKey="issueDate"/>
-        <field name="到期日期" key="dqrq" ebsKey="dueDate"/>
-        <field name="承兑银行" key="cdyx" ebsKey="acceptorName"/>
-    </table>
-
-
-<!--    <table name="票据池" key="uf_pjc" modeId="13">-->
-<!--        <field name="收到日期/开具日期" key="sdrqkjrq" ebsKey="acceptorDate"/>-->
-<!--        <field name="回款人/收款人" key="hkrskr" ebsKey="drawerName"/>-->
-<!--        <field name="票面金额" key="pmje" ebsKey="billAmount"/>-->
-<!--        <field name="票据编号" key="pjbh" ebsKey="billNbr" unique="true"/>-->
-<!--        <field name="出票日期" key="cprq" ebsKey="issueDate"/>-->
-<!--        <field name="到期日期" key="dqrq" ebsKey="dueDate"/>-->
-<!--        <field name="承兑银行/付款银行" key="cdyhfkyh" ebsKey="acceptorName/"/>-->
-<!--    </table>-->
-
-
-</config>
diff --git a/resource/WEB-INF/prop/hrmSalaryCBS8.properties b/resource/WEB-INF/prop/hrmSalaryCBS8.properties
deleted file mode 100644
index 74306bcb8..000000000
--- a/resource/WEB-INF/prop/hrmSalaryCBS8.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-app_id=Yg8fWSvs
-app_secret=1f23768c02219d7864b0009c30a1b6a59fe84606
-bodyEncryptionKey=0467E11F7CA86D884C990D4F3F5C2A1EFEEBB02B9878F4FDDCB7899DFABADCC8F38FC23F007A8AF9B2EB8A1D313959647CD8A1542F0414116AE6CFCA792346A802
-signEncryptionPrivateKey=135d6d61d5e820a979e58f4939abbd528c82528c8c276852445854377e1df247
-bodyDecryptionKey=135d6d61d5e820a979e58f4939abbd528c82528c8c276852445854377e1df247
-host=https://cbs8-openapi-reprd.csuat.cmburl.cn
\ No newline at end of file
diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
index b55b49c10..5cba90b0f 100644
--- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
@@ -704,7 +704,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                 List<List<Long>> partitionInfo = Lists.partition((List<Long>) baseInfoEmployeeIds, 1000);
                 partitionInfo.forEach(part -> moreBaseInfoPOS.addAll(
                         getInsuranceBaseInfoMapper().getInsuranceBaseInfoListByInsuranceDetail(part)));
-                
+
                 List<InsuranceArchivesBaseInfoPO> newInsuranceArchivesBaseInfoList = new ArrayList<>();
                 //璁剧疆绀句繚銆佸叕绉噾銆佸叾浠栫鍒╂。妗坕d
                 log.info("璁剧疆绀句繚銆佸叕绉噾銆佸叾浠栫鍒╂。妗坕d");
@@ -1553,7 +1553,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
                         itemResult.put("paymentOrganizationName", taxAgentIdWithNameMap.get(paymentOrg));
                     }
 
-
+                    itemResult.put("runStatus", base.getRunStatus());
                     resultList.add(itemResult);
                 }
             }