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

线下对比Oracle导入报错

This commit is contained in:
Harryxzy 2023-02-10 09:59:18 +08:00
parent 510a2e7d29
commit 3b657db52a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml
View File

@ -27,7 +27,7 @@
<insert id="batchInsert">
INSERT INTO hrsa_excel_acct_result(salary_sob_id, salary_acct_emp_id, salary_acct_record_id, employee_id,
salary_item_id, result_value, creator, create_time, update_time,
delete_type, tenant_key)
delete_type, tenant_key,tax_agent_id)
VALUES
<foreach collection="collection" item="item" separator=",">
(
@ -41,14 +41,15 @@
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
#{item.tenantKey},
#{item.taxAgentId}
)
</foreach>
</insert>
<insert id="batchInsert" databaseId="oracle">
INSERT INTO hrsa_excel_acct_result(salary_sob_id, salary_acct_emp_id, salary_acct_record_id, employee_id,
salary_item_id, result_value, creator, create_time, update_time,
delete_type, tenant_key)
delete_type, tenant_key,tax_agent_id)
<foreach collection="collection" item="item" separator="union all">
select
@ -62,7 +63,8 @@
#{item.createTime,jdbcType=DATE},
#{item.updateTime,jdbcType=DATE},
#{item.deleteType,jdbcType=INTEGER},
#{item.tenantKey,jdbcType=VARCHAR}
#{item.tenantKey,jdbcType=VARCHAR},
#{item.taxAgentId,jdbcType=DOUBLE}
from dual
</foreach>
</insert>
@ -70,7 +72,7 @@
<foreach collection="collection" item="item" separator=";">
INSERT INTO hrsa_excel_acct_result( salary_sob_id, salary_acct_emp_id, salary_acct_record_id, employee_id,
salary_item_id, result_value, creator, create_time, update_time,
delete_type, tenant_key)
delete_type, tenant_key, tax_agent_id)
VALUES
(
#{item.salarySobId},
@ -83,7 +85,8 @@
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
#{item.tenantKey}
#{item.tenantKey},
#{item.taxAgentId}
)
</foreach>
</insert>

5
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -891,6 +891,11 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (StringUtils.equals("importExcelAcctResult", importType)) {
getSalaryComparisonResultService(user).deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId));
if (CollectionUtils.isNotEmpty(excelAcctResults)) {
excelAcctResults.stream().forEach(result -> {
if(StringUtils.isEmpty(result.getResultValue())){
result.setResultValue(" ");
}
});
getSalaryComparisonResultService(user).batchSave(excelAcctResults);
}
}