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

!29 11 

Merge pull request !29 from reset/archive
This commit is contained in:
reset 2022-04-22 10:06:52 +00:00 committed by Gitee
parent 16a4f32ec1 906f9a8a36
commit de39d7e26b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 213 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -678,6 +678,7 @@ public class SIAccountBiz extends Service{
}
}
InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(billMonth);
DataCollectionEmployee simpleEmployee = MapperProxyFactory.getProxy(EmployMapper.class).getEmployeeById(employeeId);
insuranceAccountBatchPO.setAccountant(currentUserName);
insuranceAccountBatchPO.setUpdateTime(new Date());

2
src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
View File

@ -23,7 +23,7 @@ public interface InsuranceAccountBatchMapper {
List<InsuranceAccountBatchPO> list(@Param("param")InsuranceAccountBatchParam queryParam);
/**
* 根据账单月份查询单条记录
* 根据账单月份查询
* @param billMonth
* @return
*/

2
src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
View File

@ -109,7 +109,7 @@
</select>
<select id="getByBillMonth" resultMap="BaseResultMap">
<select id="getByBillMonth" resultMap="BaseResultMap" >
SELECT
<include refid="baseColumns"/>
FROM

214
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
View File

@ -304,10 +304,10 @@
<insert id="batchSaveAccountDetails">
INSERT INTO hrsa_bill_detail
(employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org,
fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,
fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key)
(employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string,
fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum,
com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key)
VALUES
<foreach collection="accounts" item="item" separator=",">
(
@ -316,53 +316,51 @@
#{item.billStatus},
#{item.paymentStatus},
#{item.supplementaryMonth},
#{item.supplementaryProjects},
#{item.resourceFrom},
#{item.socialPayOrg},
#{item.socialAccount},
#{item.socialSchemeId},
#{item.socialPaymentBaseString},
#{item.fundPayOrg},
#{item.fundAccount}
#{item.supplementFundAccount}
#{item.otherPayOrg}
#{item.socialSchemeId}
#{item.socialPaymentBaseString}
#{item.fundSchemeId}
#{item.fundPaymentBaseString}
#{item.otherSchemeId}
#{item.otherPaymentBaseString}
#{item.socialPerJson}
#{item.socialPerSum}
#{item.fundPerJson}
#{item.fundPerSum}
#{item.otherPerJson}
#{item.otherPerSum}
#{item.perSum}
#{item.socialComJson}
#{item.socialComSum}
#{item.fundComJson}
#{item.fundComSum}
#{item.otherComJson}
#{item.otherComSum}
#{item.comSum}
#{item.socialSum}
#{item.fundSum}
#{item.otherSum}
#{item.total}
#{item.creator}
#{item.deleteType}
#{item.createTime}
#{item.updateTime}
#{item.fundAccount},
#{item.supplementFundAccount},
#{item.fundSchemeId},
#{item.fundPaymentBaseString},
#{item.otherPayOrg},
#{item.otherSchemeId},
#{item.otherPaymentBaseString},
#{item.socialPerJson},
#{item.socialPerSum},
#{item.fundPerJson},
#{item.fundPerSum},
#{item.otherPerJson},
#{item.otherPerSum},
#{item.perSum},
#{item.socialComJson},
#{item.socialComSum},
#{item.fundComJson},
#{item.fundComSum},
#{item.otherComJson},
#{item.otherComSum},
#{item.comSum},
#{item.socialSum},
#{item.fundSum},
#{item.otherSum},
#{item.total},
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
)
</foreach>
</insert>
<insert id="hrsa_bill_detail" databaseId="oracle">
INSERT INTO hrsa_bill_detail
(employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org,
fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,
fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key)
(employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string,
fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum,
com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key)
<foreach collection="accounts" item="item" separator="union all">
select
#{item.employeeId},
@ -370,42 +368,41 @@
#{item.billStatus},
#{item.paymentStatus},
#{item.supplementaryMonth},
#{item.supplementaryProjects},
#{item.resourceFrom},
#{item.socialPayOrg},
#{item.socialAccount},
#{item.socialSchemeId},
#{item.socialPaymentBaseString},
#{item.fundPayOrg},
#{item.fundAccount}
#{item.supplementFundAccount}
#{item.otherPayOrg}
#{item.socialSchemeId}
#{item.socialPaymentBaseString}
#{item.fundSchemeId}
#{item.fundPaymentBaseString}
#{item.otherSchemeId}
#{item.otherPaymentBaseString}
#{item.socialPerJson}
#{item.socialPerSum}
#{item.fundPerJson}
#{item.fundPerSum}
#{item.otherPerJson}
#{item.otherPerSum}
#{item.perSum}
#{item.socialComJson}
#{item.socialComSum}
#{item.fundComJson}
#{item.fundComSum}
#{item.otherComJson}
#{item.otherComSum}
#{item.comSum}
#{item.socialSum}
#{item.fundSum}
#{item.otherSum}
#{item.total}
#{item.creator}
#{item.deleteType}
#{item.createTime}
#{item.updateTime}
#{item.fundAccount},
#{item.supplementFundAccount},
#{item.fundSchemeId},
#{item.fundPaymentBaseString},
#{item.otherPayOrg},
#{item.otherSchemeId},
#{item.otherPaymentBaseString},
#{item.socialPerJson},
#{item.socialPerSum},
#{item.fundPerJson},
#{item.fundPerSum},
#{item.otherPerJson},
#{item.otherPerSum},
#{item.perSum},
#{item.socialComJson},
#{item.socialComSum},
#{item.fundComJson},
#{item.fundComSum},
#{item.otherComJson},
#{item.otherComSum},
#{item.comSum},
#{item.socialSum},
#{item.fundSum},
#{item.otherSum},
#{item.total},
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
from dual
</foreach>
@ -413,10 +410,10 @@
<insert id="hrsa_bill_detail" databaseId="sqlserver">
<foreach collection="accounts" item="item" separator=";">
INSERT INTO hrsa_bill_detail
(employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org,
fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,
fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key)
(employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string,
fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum,
com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key)
VALUES
(
#{item.employeeId},
@ -424,42 +421,41 @@
#{item.billStatus},
#{item.paymentStatus},
#{item.supplementaryMonth},
#{item.supplementaryProjects},
#{item.resourceFrom},
#{item.socialPayOrg},
#{item.socialAccount},
#{item.socialSchemeId},
#{item.socialPaymentBaseString},
#{item.fundPayOrg},
#{item.fundAccount}
#{item.supplementFundAccount}
#{item.otherPayOrg}
#{item.socialSchemeId}
#{item.socialPaymentBaseString}
#{item.fundSchemeId}
#{item.fundPaymentBaseString}
#{item.otherSchemeId}
#{item.otherPaymentBaseString}
#{item.socialPerJson}
#{item.socialPerSum}
#{item.fundPerJson}
#{item.fundPerSum}
#{item.otherPerJson}
#{item.otherPerSum}
#{item.perSum}
#{item.socialComJson}
#{item.socialComSum}
#{item.fundComJson}
#{item.fundComSum}
#{item.otherComJson}
#{item.otherComSum}
#{item.comSum}
#{item.socialSum}
#{item.fundSum}
#{item.otherSum}
#{item.total}
#{item.creator}
#{item.deleteType}
#{item.createTime}
#{item.updateTime}
#{item.fundAccount},
#{item.supplementFundAccount},
#{item.fundSchemeId},
#{item.fundPaymentBaseString},
#{item.otherPayOrg},
#{item.otherSchemeId},
#{item.otherPaymentBaseString},
#{item.socialPerJson},
#{item.socialPerSum},
#{item.fundPerJson},
#{item.fundPerSum},
#{item.otherPerJson},
#{item.otherPerSum},
#{item.perSum},
#{item.socialComJson},
#{item.socialComSum},
#{item.fundComJson},
#{item.fundComSum},
#{item.otherComJson},
#{item.otherComSum},
#{item.comSum},
#{item.socialSum},
#{item.fundSum},
#{item.otherSum},
#{item.total},
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
)
</foreach>

213
src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
View File

@ -112,10 +112,10 @@
<insert id="batchSaveAccountTempDetails">
INSERT INTO hrsa_bill_detail_temp
(employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org,
fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,
fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key)
(employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string,
fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum,
com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key)
VALUES
<foreach collection="accounts" item="item" separator=",">
(
@ -124,52 +124,51 @@
#{item.billStatus},
#{item.paymentStatus},
#{item.supplementaryMonth},
#{item.supplementaryProjects},
#{item.resourceFrom},
#{item.socialPayOrg},
#{item.socialAccount},
#{item.socialSchemeId},
#{item.socialPaymentBaseString},
#{item.fundPayOrg},
#{item.fundAccount}
#{item.supplementFundAccount}
#{item.otherPayOrg}
#{item.socialSchemeId}
#{item.socialPaymentBaseString}
#{item.fundSchemeId}
#{item.fundPaymentBaseString}
#{item.otherSchemeId}
#{item.otherPaymentBaseString}
#{item.socialPerJson}
#{item.socialPerSum}
#{item.fundPerJson}
#{item.fundPerSum}
#{item.otherPerJson}
#{item.otherPerSum}
#{item.perSum}
#{item.socialComJson}
#{item.socialComSum}
#{item.fundComJson}
#{item.fundComSum}
#{item.otherComJson}
#{item.otherComSum}
#{item.comSum}
#{item.socialSum}
#{item.fundSum}
#{item.otherSum}
#{item.total}
#{item.creator}
#{item.deleteType}
#{item.createTime}
#{item.updateTime}
#{item.fundAccount},
#{item.supplementFundAccount},
#{item.fundSchemeId},
#{item.fundPaymentBaseString},
#{item.otherPayOrg},
#{item.otherSchemeId},
#{item.otherPaymentBaseString},
#{item.socialPerJson},
#{item.socialPerSum},
#{item.fundPerJson},
#{item.fundPerSum},
#{item.otherPerJson},
#{item.otherPerSum},
#{item.perSum},
#{item.socialComJson},
#{item.socialComSum},
#{item.fundComJson},
#{item.fundComSum},
#{item.otherComJson},
#{item.otherComSum},
#{item.comSum},
#{item.socialSum},
#{item.fundSum},
#{item.otherSum},
#{item.total},
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
)
</foreach>
</insert>
<insert id="batchSaveAccountTempDetails" databaseId="oracle">
INSERT INTO hrsa_bill_detail_temp
(employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org,
fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,
fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key)
(employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string,
fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum,
com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key)
<foreach collection="accounts" item="item" separator="union all">
select
@ -178,42 +177,41 @@
#{item.billStatus},
#{item.paymentStatus},
#{item.supplementaryMonth},
#{item.supplementaryProjects},
#{item.resourceFrom},
#{item.socialPayOrg},
#{item.socialAccount},
#{item.socialSchemeId},
#{item.socialPaymentBaseString},
#{item.fundPayOrg},
#{item.fundAccount}
#{item.supplementFundAccount}
#{item.otherPayOrg}
#{item.socialSchemeId}
#{item.socialPaymentBaseString}
#{item.fundSchemeId}
#{item.fundPaymentBaseString}
#{item.otherSchemeId}
#{item.otherPaymentBaseString}
#{item.socialPerJson}
#{item.socialPerSum}
#{item.fundPerJson}
#{item.fundPerSum}
#{item.otherPerJson}
#{item.otherPerSum}
#{item.perSum}
#{item.socialComJson}
#{item.socialComSum}
#{item.fundComJson}
#{item.fundComSum}
#{item.otherComJson}
#{item.otherComSum}
#{item.comSum}
#{item.socialSum}
#{item.fundSum}
#{item.otherSum}
#{item.total}
#{item.creator}
#{item.deleteType}
#{item.createTime}
#{item.updateTime}
#{item.fundAccount},
#{item.supplementFundAccount},
#{item.fundSchemeId},
#{item.fundPaymentBaseString},
#{item.otherPayOrg},
#{item.otherSchemeId},
#{item.otherPaymentBaseString},
#{item.socialPerJson},
#{item.socialPerSum},
#{item.fundPerJson},
#{item.fundPerSum},
#{item.otherPerJson},
#{item.otherPerSum},
#{item.perSum},
#{item.socialComJson},
#{item.socialComSum},
#{item.fundComJson},
#{item.fundComSum},
#{item.otherComJson},
#{item.otherComSum},
#{item.comSum},
#{item.socialSum},
#{item.fundSum},
#{item.otherSum},
#{item.total},
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
from dual
</foreach>
@ -221,10 +219,10 @@
<insert id="batchSaveAccountTempDetails" databaseId="sqlserver">
<foreach collection="accounts" item="item" separator=";">
INSERT INTO hrsa_bill_detail_temp
(employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org,
fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,
fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key)
(employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string,
fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json,
social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum,
com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key)
VALUES
(
#{item.employeeId},
@ -232,42 +230,41 @@
#{item.billStatus},
#{item.paymentStatus},
#{item.supplementaryMonth},
#{item.supplementaryProjects},
#{item.resourceFrom},
#{item.socialPayOrg},
#{item.socialAccount},
#{item.socialSchemeId},
#{item.socialPaymentBaseString},
#{item.fundPayOrg},
#{item.fundAccount}
#{item.supplementFundAccount}
#{item.otherPayOrg}
#{item.socialSchemeId}
#{item.socialPaymentBaseString}
#{item.fundSchemeId}
#{item.fundPaymentBaseString}
#{item.otherSchemeId}
#{item.otherPaymentBaseString}
#{item.socialPerJson}
#{item.socialPerSum}
#{item.fundPerJson}
#{item.fundPerSum}
#{item.otherPerJson}
#{item.otherPerSum}
#{item.perSum}
#{item.socialComJson}
#{item.socialComSum}
#{item.fundComJson}
#{item.fundComSum}
#{item.otherComJson}
#{item.otherComSum}
#{item.comSum}
#{item.socialSum}
#{item.fundSum}
#{item.otherSum}
#{item.total}
#{item.creator}
#{item.deleteType}
#{item.createTime}
#{item.updateTime}
#{item.fundAccount},
#{item.supplementFundAccount},
#{item.fundSchemeId},
#{item.fundPaymentBaseString},
#{item.otherPayOrg},
#{item.otherSchemeId},
#{item.otherPaymentBaseString},
#{item.socialPerJson},
#{item.socialPerSum},
#{item.fundPerJson},
#{item.fundPerSum},
#{item.otherPerJson},
#{item.otherPerSum},
#{item.perSum},
#{item.socialComJson},
#{item.socialComSum},
#{item.fundComJson},
#{item.fundComSum},
#{item.otherComJson},
#{item.otherComSum},
#{item.comSum},
#{item.socialSum},
#{item.fundSum},
#{item.otherSum},
#{item.total},
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
)
</foreach>