From 3b657db52a071c7a5e304562ea7b7e6dc3996809 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 10 Feb 2023 09:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E5=AF=B9=E6=AF=94Oracle?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/salaryacct/ExcelAcctResultMapper.xml   | 15 +++++++++------
 .../service/impl/SalaryAcctExcelServiceImpl.java  |  5 +++++
 2 files changed, 14 insertions(+), 6 deletions(-)

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 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> 
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);
                 }
             }