From 8d8fc5c15d9045ad4241fbd72dcec6688d688f71 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 11 Oct 2024 10:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=8F=B0=E8=B4=A6=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/InsuranceExportMapper.xml   |  6 ++--
 .../InsuranceAccountDetailMapper.xml          | 28 +++++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.xml b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
index f12ae2d49..cc4934057 100644
--- a/src/com/engine/salary/mapper/InsuranceExportMapper.xml
+++ b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
@@ -284,7 +284,7 @@
 
     <select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO">
         SELECT
-        a.*,a.department_name AS fixedDepartmentName,a.status         AS fixedUserStatus,
+        a.*,
         e.username AS userName,e.mobile AS telephone,d.departmentname AS departmentName,e.status AS userStatus,e.workcode AS workcode
         FROM(
         SELECT * from hrsa_excel_bill_detail
@@ -296,7 +296,7 @@
     </select>
     <select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="oracle">
          SELECT
-        a.*,a.department_name AS fixedDepartmentName,a.status         AS fixedUserStatus,
+        a.*,
         e.username AS userName,e.mobile AS telephone,d.departmentname AS departmentName,e.status AS userStatus,e.workcode AS workcode
         FROM(
         SELECT * from hrsa_excel_bill_detail
@@ -308,7 +308,7 @@
      </select>
     <select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="sqlserver">
            SELECT
-        a.*,a.department_name AS fixedDepartmentName,a.status         AS fixedUserStatus,
+        a.*,
         e.username AS userName,e.mobile AS telephone,d.departmentname AS departmentName,e.status AS userStatus,e.workcode AS workcode
         FROM(
         SELECT * from hrsa_excel_bill_detail
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 205a14884..7e5ad0d8b 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -49,6 +49,16 @@
         <result column="update_time" property="updateTime"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="payment_organization" property="paymentOrganization"/>
+        <result column="subcompany_name" property="subcompanyName"/>
+        <result column="subcompany_id" property="subcompanyId"/>
+        <result column="department_name" property="departmentName"/>
+        <result column="department_id" property="departmentId"/>
+        <result column="jobtitle_name" property="jobtitleName"/>
+        <result column="jobtitle_id" property="jobtitleId"/>
+        <result column="jobcall" property="jobcall"/>
+        <result column="jobcall_id" property="jobcallId"/>
+        <result column="status" property="status"/>
+
     </resultMap>
 
     <!-- 表字段 -->
@@ -103,15 +113,15 @@
         , t.update_time
         , t.tenant_key
         , t.payment_organization
-        , t.subcompany_name as subcompanyName
-        , t.subcompany_id as subcompanyId
-        , t.department_name as departmentName
-        , t.department_id as departmentId
-        , t.jobtitle_name as jobtitleName
-        , t.jobtitle_id as jobtitleId
-        , t.jobcall as jobcall
-        , t.jobcall_id as jobcallId
-        , t.status as status
+        , t.subcompany_name
+        , t.subcompany_id
+        , t.department_name
+        , t.department_id
+        , t.jobtitle_name
+        , t.jobtitle_id
+        , t.jobcall
+        , t.jobcall_id
+        , t.status
     </sql>
     <sql id="baseColumnsNoJoin">
         t