qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/custom/艾志工业' into custom/艾志工业

This commit is contained in:
Harryxzy 2025-04-11 13:57:44 +08:00
parent fe9fb5c07c 7346f020a0
commit e7d1047b1f
3 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resource/WEB-INF/CBS2ECConfig.xml
View File

@ -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>

6
resource/WEB-INF/prop/hrmSalaryCBS8.properties
View File

@ -1,6 +0,0 @@
app_id=Yg8fWSvs
app_secret=1f23768c02219d7864b0009c30a1b6a59fe84606
bodyEncryptionKey=0467E11F7CA86D884C990D4F3F5C2A1EFEEBB02B9878F4FDDCB7899DFABADCC8F38FC23F007A8AF9B2EB8A1D313959647CD8A1542F0414116AE6CFCA792346A802
signEncryptionPrivateKey=135d6d61d5e820a979e58f4939abbd528c82528c8c276852445854377e1df247
bodyDecryptionKey=135d6d61d5e820a979e58f4939abbd528c82528c8c276852445854377e1df247
host=https://cbs8-openapi-reprd.csuat.cmburl.cn

4
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -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<>();
//设置社保、公积金、其他福利档案id
log.info("设置社保、公积金、其他福利档案id");
@ -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);
}
}