diff --git a/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml b/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml
index 26d664d94..afbd2083e 100644
--- a/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml
@@ -27,7 +27,7 @@
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
(
@@ -41,14 +41,15 @@
#{item.createTime},
#{item.updateTime},
#{item.deleteType},
- #{item.tenantKey}
+ #{item.tenantKey},
+ #{item.taxAgentId}
)
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)
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
@@ -70,7 +72,7 @@
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}
)
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index d1b56d4c0..732adbeb9 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -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);
}
}