From d3050117d1090052fd60e2508b3071735786706d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 15 Oct 2024 14:24:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=AC=A1=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollectionEmployee.java               |  3 ++
 .../salary/mapper/InsuranceExportMapper.xml   | 18 +++++-----
 .../mapper/archive/SalaryArchiveMapper.xml    |  6 ++--
 .../archive/SalaryArchiveTaxAgentMapper.xml   |  6 ++--
 .../datacollection/AddUpDeductionMapper.xml   | 12 +++----
 .../datacollection/AddUpSituationMapper.xml   |  8 ++---
 .../datacollection/AttendQuoteDataMapper.xml  |  6 ++--
 .../mapper/datacollection/EmployMapper.xml    | 34 +++++++++++++------
 .../datacollection/OtherDeductionMapper.xml   |  4 +--
 .../SpecialAddDeductionMapper.xml             |  6 ++--
 .../datacollection/VariableArchiveMapper.xml  |  6 ++--
 .../salaryacct/SalaryAcctEmployeeMapper.xml   |  9 +++--
 .../mapper/salarysob/SalarySobRangeMapper.xml |  2 +-
 .../InsuranceAccountDetailMapper.xml          | 10 +++---
 .../mapper/siarchives/SocialSchemeMapper.xml  |  1 -
 15 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
index a4ce08bb3..38eb1c8c7 100644
--- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
+++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
@@ -114,6 +114,9 @@ public class DataCollectionEmployee {
     @SalaryFormulaVar(defaultLabel = "证件号码", labelId = 98624, dataType = "string")
     private String idNo;
 
+    //主次账号   0/null：主账号    1：次账号
+    private Integer accountType;
+
     //是否是系统管理员
     private Boolean isAdmin;
 
diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.xml b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
index dbe86d9f6..0803f7892 100644
--- a/src/com/engine/salary/mapper/InsuranceExportMapper.xml
+++ b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
@@ -21,7 +21,7 @@
                  LEFT JOIN hrmdepartment d ON d.id = e.departmentid
                  LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
@@ -47,7 +47,7 @@
                  LEFT JOIN hrmdepartment d ON d.id = e.departmentid
                  LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
@@ -73,7 +73,7 @@
                  LEFT JOIN hrmdepartment d ON d.id = e.departmentid
                  LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
@@ -90,7 +90,7 @@
         LEFT JOIN hrmresource e ON e.ID = a.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
         where          e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
     </select>
     <select id="exportExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="oracle">
          SELECT
@@ -102,7 +102,7 @@
         LEFT JOIN hrmresource e ON e.ID = a.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
         where          e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
      </select>
     <select id="exportExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="sqlserver">
            SELECT
@@ -114,7 +114,7 @@
         LEFT JOIN hrmresource e ON e.ID = a.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
         where          e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
      </select>
 
 
@@ -139,7 +139,7 @@
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         where e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
@@ -166,7 +166,7 @@
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         where e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
@@ -193,7 +193,7 @@
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         where e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY  ${param.orderRule.orderRule}  ${param.orderRule.ascOrDesc}
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index 259cb45d1..212354488 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -118,7 +118,7 @@
         WHERE t.delete_type = 0
         and t.employee_type is null
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="param.ids != null and param.ids.size()>0">
             AND t.id IN
             <foreach collection="param.ids" open="(" item="id" separator="," close=")">
@@ -222,7 +222,7 @@
         WHERE t.delete_type = 0
         and t.employee_type is null
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="param.ids != null and param.ids.size()>0">
             AND t.id IN
             <foreach collection="param.ids" open="(" item="id" separator="," close=")">
@@ -323,7 +323,7 @@
         WHERE t.delete_type = 0
         and t.employee_type is null
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="param.ids != null and param.ids.size()>0">
             AND t.id IN
             <foreach collection="param.ids" open="(" item="id" separator="," close=")">
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml
index 900888f9c..3639039e2 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml
@@ -556,7 +556,7 @@
         WHERE
         t1.delete_type = 0
         AND e.status != '7'
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 关键字（姓名、部门、个税扣缴义务人） -->
         <if test="param.keyword != null and param.keyword != ''">
             AND (
@@ -580,7 +580,7 @@
         WHERE
         t1.delete_type = 0
         AND e.status != '7'
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="param.keyword != null and param.keyword != ''">
             AND (
             e.lastname like '%'||#{param.keyword}||'%'
@@ -602,7 +602,7 @@
         WHERE
         t1.delete_type = 0
         AND e.status != '7'
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="param.keyword != null and param.keyword != ''">
             AND (
             e.lastname like '%'+#{param.keyword}+'%'
diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
index ebd2b723f..5393e4363 100644
--- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
@@ -96,7 +96,7 @@
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
     </select>
 
 
@@ -326,7 +326,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -347,7 +347,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -367,7 +367,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -649,7 +649,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         ORDER BY t1.declare_month DESC
     </select>
@@ -664,7 +664,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="taxAgentIds != null and taxAgentIds.size() != 0">
             and tax_agent_id in
             <foreach collection="taxAgentIds" item="taxAgentId" open="(" separator="," close=")">
diff --git a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
index 1a4e58158..2b5c45519 100644
--- a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
@@ -336,7 +336,7 @@
         t1.delete_type = 0
         AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -360,7 +360,7 @@
         t1.delete_type = 0
         AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -384,7 +384,7 @@
         t1.delete_type = 0
         AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -405,7 +405,7 @@
         t1.delete_type = 0
         AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         ORDER BY t1.tax_year_month DESC
     </select>
diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml
index 234d990b3..ca51de22a 100644
--- a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml
@@ -261,7 +261,7 @@
         WHERE
          t1.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -279,7 +279,7 @@
         WHERE
         t1.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -297,7 +297,7 @@
         WHERE
         t1.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index ae903a6a7..149522857 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -10,11 +10,12 @@
                e.mobile,
                e.workcode,
                e.certificatenum as idNo,
+               e.accounttype as accountType,
                'false' as extEmp
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
     </select>
 
     <select id="getEmployeeByIds" resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
@@ -25,9 +26,10 @@
         e.workcode as workcode,
         e.companystartdate as companystartdate,
         e.mobile as mobile,
+        e.accounttype as accountType,
         e.workyear as workYear
         from hrmresource e
-        where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+        where e.status not in (7)
         <if test="collection != null and collection.size()>0">
             AND e.id IN
             <foreach collection="collection" open="(" item="id" separator="," close=")">
@@ -44,6 +46,7 @@
         e.workcode as workcode,
         e.companystartdate as companystartdate,
         e.mobile as mobile,
+        e.accounttype as accountType,
         e.workyear as workYear
         from hrmresource e
         where e.status not in (7)
@@ -78,13 +81,15 @@
         e.certificatenum as idNo,
         e.enddate as dismissdate,
         e.workyear,
+        e.accounttype as accountType,
         e.companyworkyear
         from hrmresource e
         left join hrmdepartment d on e.departmentid = d.id
         left join hrmjobtitles c on e.jobtitle = c.id
         left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
         left join hrmjobcall job on e.jobcall=job.id
-        where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+        where e.status not in (7)
+        and (e.accounttype is null or e.accounttype = 0)
         <if test="collection != null and collection.size()>0">
             AND e.id IN
             <foreach collection="collection" open="(" item="id" separator="," close=")">
@@ -126,6 +131,7 @@
         c.id as jobtitleId,
         e.companystartdate as companystartdate,
         e.mobile as mobile,
+        e.accounttype as accountType,
         sc.SUBCOMPANYNAME as subcompanyName,
         sc.id as subcompanyid,
         job.id as jobcallId,
@@ -135,7 +141,7 @@
         left join hrmdepartment d on e.departmentid = d.id
         left join hrmjobtitles c on e.jobtitle = c.id
         left join hrmjobcall job on e.jobcall=job.id
-        WHERE e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+        WHERE e.status not in (7)
         <if test="params != null and params.size() > 0">
             AND ( 1=2
             <foreach collection="params" item="param">
@@ -184,10 +190,11 @@
         h.certificatenum as idNo,
         h.workcode as workcode,
         h.companystartdate as companystartdate,
+        h.accounttype as accountType,
         h.mobile as mobile
         from hrmresourcevirtual v
         left join hrmresource h on v.resourceid=h.id
-        WHERE h.status not in (7) and (h.accounttype is null or h.accounttype = 0)
+        WHERE h.status not in (7)
         <if test="params != null and params.size() > 0">
             AND ( 1=2
             <foreach collection="params" item="param">
@@ -231,6 +238,7 @@
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
                e.enddate          as dismissdate,
+               e.accounttype as accountType,
                sc.SUBCOMPANYNAME as subcompanyName,
                sc.id as subcompanyid
         from hrmresource e
@@ -238,7 +246,7 @@
                  left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
                  left join hrmjobtitles c on e.jobtitle = c.id
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
           AND e.id = #{id}
     </select>
 
@@ -278,6 +286,7 @@
                e.certificatenum   as idNo,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
+               e.accounttype as accountType,
                e.subcompanyid1    as subcompanyid,
                d.departmentname   as departmentName,
                d.id               as departmentId,
@@ -287,7 +296,6 @@
                  left join hrmdepartment d on e.departmentid = d.id
                  left join hrmjobtitles c on e.jobtitle = c.id
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
     </select>
 
     <select id="listAll" resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
@@ -298,6 +306,7 @@
                e.certificatenum   as idNo,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
+               e.accounttype as accountType,
                e.subcompanyid1    as subcompanyid,
                e.departmentid     as departmentId,
                d.DEPARTMENTNAME   as departmentName,
@@ -305,7 +314,7 @@
         from hrmresource e
         left join hrmdepartment d on e.departmentid = d.id
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
     </select>
 
 
@@ -319,6 +328,7 @@
                e.mobile           as mobile,
                e.departmentid     as departmentId,
                e.subcompanyid1    as subcompanyid,
+               e.accounttype as accountType,
                e.costcenterid     as costcenterId,
                e.locationid       as locationId,
                e.jobtitle         as jobtitleId,
@@ -327,7 +337,7 @@
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
         where e.status not in (7)
-          and (e.accounttype is null or e.accounttype = 0)
+
     </select>
 
 
@@ -480,6 +490,7 @@
                e.workcode         as workcode,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
+               e.accounttype as accountType,
                e.enddate          as dismissdate
         from hrmresource e
         where e.status in (4,5,6)
@@ -557,11 +568,12 @@
         c.jobtitlename as jobtitleName,
         c.id as jobtitleId,
         e.companystartdate as companystartdate,
+        e.accounttype as accountType,
         e.mobile as mobile
         from hrmresource e
         left join hrmdepartment d on e.departmentid = d.id
         left join hrmjobtitles c on e.jobtitle = c.id
-        WHERE e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
+        WHERE e.status not in (7)
         <if test="subCompanyIds != null and subCompanyIds.size()>0">
             AND e.subcompanyid1 IN
             <foreach collection="subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
@@ -580,6 +592,7 @@
             resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
         select  e.RESOURCEID       as employeeId,
                 e.SUBCOMPANYID     as subcompanyid,
+                h.accounttype as accountType,
                 e.DEPARTMENTID     as departmentId
         from hrmresourcevirtual e
         left join hrmresource h on e.RESOURCEID=h.id
@@ -597,6 +610,7 @@
         select
         e.RESOURCEID       as employeeId,
         e.SUBCOMPANYID     as subcompanyid,
+        h.accounttype as accountType,
         e.DEPARTMENTID     as departmentId
         from hrmresourcevirtual e
         left join hrmresource h on e.RESOURCEID=h.id
diff --git a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
index 0afae02a2..f21fed4a1 100644
--- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
@@ -280,7 +280,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <!-- 排序 -->
         <if test="param.orderRule != null">
@@ -299,7 +299,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         ORDER BY t1.declare_month DESC
     </select>
diff --git a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml
index ce701f1d9..442fe485e 100644
--- a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml
@@ -619,7 +619,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         ORDER BY  t1.create_time desc
     </select>
@@ -633,7 +633,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <if test="taxAgentIds != null and taxAgentIds.size() != 0">
             AND t1.tax_agent_id IN
             <foreach collection="taxAgentIds" open="(" item="taxAgentId" separator="," close=")">
@@ -653,7 +653,7 @@
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
         AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSql"/>
         <if test="param.orderRule != null ">
             order by ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
diff --git a/src/com/engine/salary/mapper/datacollection/VariableArchiveMapper.xml b/src/com/engine/salary/mapper/datacollection/VariableArchiveMapper.xml
index c6352fa2f..9462ea707 100644
--- a/src/com/engine/salary/mapper/datacollection/VariableArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/VariableArchiveMapper.xml
@@ -116,7 +116,7 @@
         LEFT JOIN hrsa_tax_agent a ON t.tax_agent_id = a.id
         WHERE t.delete_type = 0
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 个税扣缴义务人 -->
         <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
             AND t.tax_agent_id IN
@@ -173,7 +173,7 @@
         LEFT JOIN hrsa_tax_agent a ON t.tax_agent_id = a.id
         WHERE t.delete_type = 0
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 个税扣缴义务人 -->
         <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
             AND t.tax_agent_id IN
@@ -230,7 +230,7 @@
         LEFT JOIN hrsa_tax_agent a ON t.tax_agent_id = a.id
         WHERE t.delete_type = 0
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <!-- 个税扣缴义务人 -->
         <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
             AND t.tax_agent_id IN
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 86781c4d3..48483a038 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -262,7 +262,6 @@
             AND employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
-            and (em.accounttype is null or em.accounttype = 0)
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'||#{param.employeeName}||'%'
             </if>
@@ -343,7 +342,7 @@
             AND employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
-            and (em.accounttype is null or em.accounttype = 0)
+
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'+#{param.employeeName}+'%'
             </if>
@@ -616,7 +615,7 @@
             AND t.employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
-            and (em.accounttype is null or em.accounttype = 0)
+
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE CONCAT('%',#{param.employeeName},'%')
             </if>
@@ -692,7 +691,7 @@
             AND t.employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
-            and (em.accounttype is null or em.accounttype = 0)
+
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'||#{param.employeeName}||'%'
             </if>
@@ -766,7 +765,7 @@
             AND t.employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
-            and (em.accounttype is null or em.accounttype = 0)
+
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'+#{param.employeeName}+'%'
             </if>
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
index d46406ff5..e05bdf60f 100644
--- a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
@@ -434,7 +434,7 @@
     <select id="listEmployeeIds" resultType="long">
         SELECT id FROM hrmresource em
         WHERE  em.status not in (7)
-        and (em.accounttype is null or em.accounttype = 0)
+
         <if test="params != null and params.size() > 0">
             AND ( 1=2
             <foreach collection="params" item="param">
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 977fb9edd..37120db28 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -434,7 +434,7 @@
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         WHERE t.delete_type = 0
         and e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="paramSqlCommon"/>
         <include refid="paramSql"/>
         <!-- 排序 -->
@@ -589,7 +589,7 @@
         ON e.ID = l.resource_n
         WHERE(
         e.status != '5'
-        and (e.accounttype is null or e.accounttype = 0)
+
         OR l.dismissdate IS NULL
         OR l.dismissdate = ''
         OR l.dismissdate
@@ -659,7 +659,7 @@
     <!--                                             ON e.ID = l.resource_n-->
     <!--                          WHERE(-->
     <!--                                   e.status != '5'-->
-    <!--                                       and (e.accounttype is null or e.accounttype = 0)-->
+    <!--                                       -->
     <!--                             OR l.dismissdate IS NULL-->
     <!--                             OR l.dismissdate = ''-->
     <!--                             OR l.dismissdate-->
@@ -1045,7 +1045,7 @@
         LEFT JOIN bill_hrmdismiss l ON e.ID = l.resource_n
         LEFT JOIN hrmdepartment d ON d.ID = e.departmentid
         WHERE
-        e.STATUS = 5 and (e.accounttype is null or e.accounttype = 0) AND h.payment_status = 0
+        e.STATUS = 5  AND h.payment_status = 0
         <include refid="likeCondition"/>
         AND(l.dismissdate IS NOT NULL)
         )AS t
@@ -1121,7 +1121,7 @@
         LEFT JOIN hrmdepartment d ON d.ID = e.departmentid
         WHERE
         e.STATUS not in (4,5,6,7)
-        and (e.accounttype is null or e.accounttype = 0)
+
         <include refid="likeCondition"/>
         AND(
         l.dismissdate IS NULL OR l.dismissdate = ''
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index 9041bde36..857e0ae1f 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -336,7 +336,6 @@
         LEFT JOIN bill_hrmdismiss f on a.id = f.resource_n
         WHERE
         a.status not in (7)
-        and (a.accounttype is null or a.accounttype = 0)
         <include refid="paramSql"/>
         <include refid="paramSqlCommon"/>
         ORDER BY a.id asc

From 53ce7c7b434657422523f8fb1ea0641768f57614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 16 Oct 2024 15:25:48 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=AC=A1=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollectionEmployee.java               |  9 ++-
 .../entity/salaryBill/bo/SalaryBillBO.java    |  2 +
 .../salaryacct/bo/SalaryAcctEmployeeBO.java   |  5 ++
 .../salaryacct/bo/SalaryAcctFormulaBO.java    |  4 ++
 .../salaryacct/bo/SalaryAcctResultBO.java     |  9 +++
 .../dto/SalaryAccEmployeeListDTO.java         |  4 ++
 .../salaryacct/po/SalaryAcctEmployeePO.java   |  7 ++
 .../salaryarchive/bo/SalaryArchiveBO.java     |  1 +
 .../dto/SalaryArchiveListDTO.java             |  3 +
 .../dto/SalaryFormulaEmployeeDTO.java         |  5 ++
 .../engine/salary/enums/AccountTypeEnum.java  | 68 ++++++++++++++++++
 .../mapper/archive/SalaryArchiveMapper.xml    |  1 +
 .../salaryacct/SalaryAcctEmployeeMapper.xml   | 29 ++++++--
 .../impl/SalaryArchiveServiceImpl.java        | 12 +++-
 .../impl/SalaryEmployeeServiceImpl.java       | 69 ++++++++++++++++---
 .../service/impl/SalarySendServiceImpl.java   |  2 +
 .../sys/constant/SalarySysConstant.java       |  5 ++
 17 files changed, 218 insertions(+), 17 deletions(-)
 create mode 100644 src/com/engine/salary/enums/AccountTypeEnum.java

diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
index 38eb1c8c7..9c6fa710b 100644
--- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
+++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
@@ -114,7 +114,14 @@ public class DataCollectionEmployee {
     @SalaryFormulaVar(defaultLabel = "证件号码", labelId = 98624, dataType = "string")
     private String idNo;
 
-    //主次账号   0/null：主账号    1：次账号
+
+    @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "accountTypeName")
+    private String accountTypeName;
+
+    /**
+     * 0/null：主账号    1：次账号
+     */
+    @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "accountType")
     private Integer accountType;
 
     //是否是系统管理员
diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
index 1bdae5dda..6dd815653 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
@@ -145,6 +145,8 @@ public class SalaryBillBO {
                     .workcode(simpleEmployee.getWorkcode())
                     .idNo(simpleEmployee.getIdNo())
                     .statusName(simpleEmployee.getStatusName())
+                    .accountType(simpleEmployee.getAccountType())
+                    .accountTypeName(simpleEmployee.getAccountTypeName())
                     .build();
             List<SalaryTemplateSalaryItemListDTO> items = employeeInformation.getItems();
             // 1.SalaryAcctResultBO.buildEmployeeFieldName()的取法
diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java
index c0c2dfa53..a8dbc514e 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java
@@ -8,6 +8,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentDataDTO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.enums.AccountTypeEnum;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.google.common.collect.Lists;
@@ -66,6 +67,7 @@ public class SalaryAcctEmployeeBO {
                             .departmentId(e.getDepartmentId())
                             .departmentName(e.getDepartmentName())
                             .status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(e.getStatus())))
+                            .accountType(AccountTypeEnum.getDefaultLabelByValue(e.getAccountType()))
                             .mobile(simpleEmployee.getMobile())
                             .jobNum(simpleEmployee.getWorkcode())
                             .hireDate(simpleEmployee.getCompanystartdate())
@@ -110,6 +112,7 @@ public class SalaryAcctEmployeeBO {
                         .subcompanyId(emp.getSubcompanyid())
                         .subcompanyName(emp.getSubcompanyName())
                         .status(emp.getStatus())
+                        .accountType(emp.getAccountType())
                         .creator(employeeId)
                         .createTime(now)
                         .updateTime(now)
@@ -138,6 +141,8 @@ public class SalaryAcctEmployeeBO {
         simpleEmployee.setJobtitleName(acctEmployeePO.getJobtitleName());
         simpleEmployee.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(acctEmployeePO.getStatus(), "1"))));
         simpleEmployee.setStatus(acctEmployeePO.getStatus());
+        simpleEmployee.setAccountType(acctEmployeePO.getAccountType());
+        simpleEmployee.setAccountTypeName(AccountTypeEnum.getDefaultLabelByValue(acctEmployeePO.getAccountType()));
     }
 
 
diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java
index 32028e25a..cc19925b2 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java
@@ -92,6 +92,8 @@ public class SalaryAcctFormulaBO {
                     .sex(sexName)
                     .status(simpleEmployee.getStatus())
                     .statusName(simpleEmployee.getStatusName())
+                    .accountType(simpleEmployee.getAccountType())
+                    .accountTypeName(simpleEmployee.getAccountTypeName())
                     .departmentName(simpleEmployee.getDepartmentName())
                     .departmentId(simpleEmployee.getDepartmentId())
                     .subcompanyName(simpleEmployee.getSubcompanyName())
@@ -115,6 +117,8 @@ public class SalaryAcctFormulaBO {
                     .sex(sexName)
                     .status(simpleEmployee.getStatus())
                     .statusName(simpleEmployee.getStatusName())
+                    .accountType(simpleEmployee.getAccountType())
+                    .accountTypeName(simpleEmployee.getAccountTypeName())
                     .departmentName(salaryAcctEmployeePO.getDepartmentName())
                     .departmentId(salaryAcctEmployeePO.getDepartmentId())
                     .subcompanyName(salaryAcctEmployeePO.getSubcompanyName())
diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
index ef1dcca05..00f7a143a 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
@@ -20,6 +20,7 @@ import com.engine.salary.entity.salarysob.dto.SalarySobItemDTO;
 import com.engine.salary.entity.salarysob.dto.SalarySobItemGroupDTO;
 import com.engine.salary.entity.salarysob.po.*;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.enums.AccountTypeEnum;
 import com.engine.salary.enums.SalaryValueTypeEnum;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryaccounting.LockStatusEnum;
@@ -308,6 +309,10 @@ public class SalaryAcctResultBO {
                         map.put("status", e.getStatus());
                     } else if ("statusName".equals(salarySobEmpField.getFieldCode())) {
                         map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(e.getStatus(), "1"))));
+                    } else if ("accountType".equals(salarySobEmpField.getFieldCode())) {
+                        map.put("accountType", e.getAccountType());
+                    } else if ("accountTypeName".equals(salarySobEmpField.getFieldCode())) {
+                        map.put("accountTypeName", AccountTypeEnum.getDefaultLabelByValue(e.getAccountType()));
                     } else {
                         map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
                     }
@@ -395,6 +400,10 @@ public class SalaryAcctResultBO {
                         map.put("status", salaryAcctEmployee.getStatus());
                     } else if ("statusName".equals(salarySobEmpField.getFieldCode())) {
                         map.put("statusName", UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(salaryAcctEmployee.getStatus(), "1"))));
+                    } else if ("accountType".equals(salarySobEmpField.getFieldCode())) {
+                        map.put("accountType", salaryAcctEmployee.getAccountType());
+                    } else if ("accountTypeName".equals(salarySobEmpField.getFieldCode())) {
+                        map.put("accountTypeName", AccountTypeEnum.getDefaultLabelByValue(salaryAcctEmployee.getAccountType()));
                     } else {
                         map.put(salarySobEmpField.getFieldCode(), fieldValueMap.get(salarySobEmpField.getFieldCode()));
                     }
diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
index 5f9d256f8..7f3521ea9 100644
--- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
+++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
@@ -60,6 +60,10 @@ public class SalaryAccEmployeeListDTO {
     @TableTitle(title = "员工状态", dataIndex = "status", key = "status")
     private String status;
 
+    //员工状态")
+    @TableTitle(title = "账号类型", dataIndex = "accountType", key = "accountType")
+    private String accountType;
+
 
     //入职日期")
     @TableTitle(title = "入职日期", dataIndex = "hireDate", key = "hireDate")
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
index d86941b8b..c979b42d8 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
@@ -143,6 +143,13 @@ public class SalaryAcctEmployeePO {
     private String status;
 
 
+    /**
+     * 主次账号   0/null：主账号    1：次账号
+     */
+    private Integer accountType;
+
+
+
     //--------条件----------
     //主键id集合
     private Collection<Long> ids;
diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
index fabbfd1b0..fd61edf07 100644
--- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
+++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
@@ -73,6 +73,7 @@ public class SalaryArchiveBO {
         employeeIdColumn.setDisplay(WeaBoolAttr.FALSE);
         columns.add(employeeIdColumn);
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username"));
+        columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "账号类型"), "accountType"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgentName"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "分部"), "subcompanyName"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
index 1083ca4dd..7719f7c15 100644
--- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
+++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
@@ -121,4 +121,7 @@ public class SalaryArchiveListDTO {
      */
     private String archiveStatus;
 
+    //主次账号   0/null：主账号    1：次账号
+    private Integer accountType;
+
 }
diff --git a/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java b/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
index 1e8fd59cc..5bcecb177 100644
--- a/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
+++ b/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
@@ -68,6 +68,11 @@ public class SalaryFormulaEmployeeDTO {
     @SalaryFormulaVar(defaultLabel = "状态", labelId = 98622, dataType = "string")
     private String statusName;
 
+    @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "string")
+    private String accountTypeName;
+
+    @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "string")
+    private Integer accountType;
     //工号
     @SalaryFormulaVar(defaultLabel = "工号", labelId = 98622, dataType = "string")
     private String workcode;
diff --git a/src/com/engine/salary/enums/AccountTypeEnum.java b/src/com/engine/salary/enums/AccountTypeEnum.java
new file mode 100644
index 000000000..34368239c
--- /dev/null
+++ b/src/com/engine/salary/enums/AccountTypeEnum.java
@@ -0,0 +1,68 @@
+package com.engine.salary.enums;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * 账号类型
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public enum AccountTypeEnum implements BaseEnum {
+
+    MAIN(0, "主账号", 1),
+    SECOND(1, "次账号", 1);
+
+    private Integer value;
+    private String defaultLabel;
+    private int labelId;
+
+
+    AccountTypeEnum(Integer value, String defaultLabel, int labelId) {
+        this.value = value;
+        this.defaultLabel = defaultLabel;
+        this.labelId = labelId;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    @Override
+    public String getDefaultLabel() {
+        return defaultLabel;
+    }
+
+    @Override
+    public Integer getLabelId() {
+        return labelId;
+    }
+
+    public static String getDefaultLabelByValue(Integer value) {
+        if (value == null) {
+            return MAIN.defaultLabel;
+        }
+        Optional<AccountTypeEnum> optional = Arrays.stream(AccountTypeEnum.values()).filter(r -> r.getValue().equals(value)).findFirst();
+        return optional.isPresent() ? optional.get().defaultLabel : "";
+    }
+
+
+    public static AccountTypeEnum parseByValue(Integer value) {
+        if (value == null) {
+            return MAIN;
+        }
+
+        for (AccountTypeEnum statusEnum : AccountTypeEnum.values()) {
+            if (Objects.equals(statusEnum.getValue(), value)) {
+                return statusEnum;
+            }
+        }
+        return MAIN;
+    }
+
+}
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index 212354488..e9d06ab89 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -101,6 +101,7 @@
         , e.enddate as dismissdate
         , e.status AS employeeStatus
         ,e.certificatenum as idNo
+        ,e.accounttype as accountType
         , d.departmentname AS departmentName
         , c.subcompanyname AS subcompanyName
     </sql>
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 48483a038..77f609f4b 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -25,6 +25,7 @@
         <result column="jobcall" property="jobcall"/>
         <result column="jobcall_id" property="jobcallId"/>
         <result column="status" property="status"/>
+        <result column="accountType" property="accountType"/>
     </resultMap>
 
     <resultMap id="SalaryAccEmployeeCountMap"
@@ -58,7 +59,8 @@
         t.jobtitle_id,
         t.jobcall,
         t.jobcall_id,
-        t.status
+        t.status,
+        t.account_type
     </sql>
 
     <sql id="emp1Column">
@@ -81,7 +83,8 @@
         jobtitle_id,
         jobcall,
         jobcall_id,
-        status)
+        status,
+        account_type)
         VALUES
         <foreach collection="collection" item="emp" separator=",">
             (
@@ -105,7 +108,8 @@
             #{emp.jobtitleId},
             #{emp.jobcall},
             #{emp.jobcallId},
-            #{emp.status}
+            #{emp.status},
+            #{emp.accountType}
             )
         </foreach>
     </insert>
@@ -121,7 +125,9 @@
         jobtitle_id,
         jobcall,
         jobcall_id,
-        status)
+        status,
+        account_type
+        )
         <foreach collection="collection" item="emp" separator="union all">
             select
             #{emp.salaryAcctRecordId,jdbcType=DOUBLE},
@@ -144,7 +150,8 @@
             #{emp.jobtitleId,jdbcType=DOUBLE},
             #{emp.jobcall,jdbcType=VARCHAR},
             #{emp.jobcallId,jdbcType=DOUBLE},
-            #{emp.status,jdbcType=VARCHAR}
+            #{emp.status,jdbcType=VARCHAR},
+            #{emp.accountType,jdbcType=INTEGER}
             from dual
         </foreach>
     </insert>
@@ -161,7 +168,9 @@
             jobtitle_id,
             jobcall,
             jobcall_id,
-            status)
+            status,
+            account_type
+            )
             VALUES
             (
             #{emp.salaryAcctRecordId},
@@ -184,7 +193,8 @@
             #{emp.jobtitleId},
             #{emp.jobcall},
             #{emp.jobcallId},
-            #{emp.status}
+            #{emp.status},
+            #{emp.accountType}
             )
         </foreach>
     </insert>
@@ -965,6 +975,7 @@
         <result column="jobcall" property="jobcall"/>
         <result column="jobcall_id" property="jobcallId"/>
         <result column="status" property="status"/>
+        <result column="account_type" property="accountType"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -993,6 +1004,7 @@
         , t.jobcall
         , t.jobcall_id
         , t.status
+        , t.account_type
     </sql>
 
 
@@ -1161,6 +1173,9 @@
             <if test="salaryAcctEmployeePO.status != null" >
                 status=#{salaryAcctEmployeePO.status},
             </if>
+            <if test="salaryAcctEmployeePO.accountType != null" >
+                account_type=#{salaryAcctEmployeePO.accountType},
+            </if>
         </set>
         WHERE id = #{salaryAcctEmployeePO.id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 5165b6c50..12bfa528c 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -76,6 +76,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.engine.salary.sys.constant.SalarySysConstant.OPEN_SECONDARY_ACCOUNT;
 import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX;
 
 /**
@@ -132,6 +133,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         return ServiceUtil.getService(SalarySobServiceImpl.class, user);
     }
 
+    //主次账号是否开启
+    boolean openSecondaryAccount = "1".equals(getSalarySysConfService(user).getValueByCode(OPEN_SECONDARY_ACCOUNT));
+
     @Override
     public SalaryArchivePO getById(Long salaryArchiveId) {
         return salaryArchiveMapper.getById(salaryArchiveId);
@@ -185,6 +189,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         }
 
         List<SalaryArchiveListDTO> list = getSalaryArchiveMapper().list(queryParam);
+        if (!openSecondaryAccount) {
+            list = list.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(list);
     }
 
@@ -489,6 +496,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
             map.put("id", e.getId());
             map.put("username", e.getUsername());
             map.put("employeeId", e.getEmployeeId());
+            if (openSecondaryAccount) {
+                map.put("accountType", 1 == e.getAccountType() ? "次账号" : "主账户");
+            }
 
 //            Optional<Map<String, Object>> optionalTaxAgent = taxAgentData.stream().filter(f -> f.get("salaryArchiveId").toString().equals(e.getId().toString())).findFirst();
             TaxAgentPO taxAgentPO = longTaxAgentPOMap.get(e.getTaxAgentId());
@@ -790,7 +800,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
             LoggerContext loggerContext = new LoggerContext();
             loggerContext.setUser(user);
             loggerContext.setTargetId(String.valueOf(e.getId()));
-            loggerContext.setTargetName( Optional.ofNullable(taxAgentMap.get(e.getTaxAgentId())).orElse(StringUtils.EMPTY) + bar + Optional.ofNullable(empMap.get(e.getEmployeeId())).orElse(StringUtils.EMPTY) );
+            loggerContext.setTargetName(Optional.ofNullable(taxAgentMap.get(e.getTaxAgentId())).orElse(StringUtils.EMPTY) + bar + Optional.ofNullable(empMap.get(e.getEmployeeId())).orElse(StringUtils.EMPTY));
             loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
             loggerContext.setOperateTypeName(operatedesc);
             loggerContext.setOperatedesc(operatedesc);
diff --git a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
index d47671229..0e3435293 100644
--- a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
@@ -23,12 +23,13 @@ import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
 import com.engine.salary.enums.salarysob.TargetTypeEnum;
 import com.engine.salary.mapper.datacollection.EmployMapper;
 import com.engine.salary.mapper.hrm.ExpandFieldSettingsMapper;
-import com.engine.salary.mapper.sys.SalarySysConfMapper;
 import com.engine.salary.service.ExtEmpService;
 import com.engine.salary.service.SalaryEmployeeService;
 import com.engine.salary.service.SalarySobExtRangeService;
 import com.engine.salary.service.SalarySobRangeService;
 import com.engine.salary.sys.entity.po.SalarySysConfPO;
+import com.engine.salary.sys.service.SalarySysConfService;
+import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.IdGenerator;
@@ -43,6 +44,8 @@ import weaver.hrm.User;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.engine.salary.sys.constant.SalarySysConstant.OPEN_SECONDARY_ACCOUNT;
+
 /**
  * 人员信息
  * <p>Copyright: Copyright (c) 2022</p>
@@ -68,8 +71,8 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
     }
 
-    private SalarySysConfMapper getSalarySysConfMapper() {
-        return SqlProxyHandle.getProxy(SalarySysConfMapper.class);
+    private SalarySysConfService getSalarySysConfService(User user) {
+        return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
     }
 
 
@@ -89,6 +92,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
 
     boolean openExtEmp = true;
 
+    //主次账号是否开启
+    boolean openSecondaryAccount = "1".equals(getSalarySysConfService(user).getValueByCode(OPEN_SECONDARY_ACCOUNT));
+
     @Override
     public List<DataCollectionEmployee> listAll(UseEmployeeTypeEnum empType) {
         List<DataCollectionEmployee> result = new ArrayList<>();
@@ -102,6 +108,11 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
             result.addAll(employBiz.listAll());
             result.addAll(getExtEmpService(user).listEmployee());
         }
+
+        if (!openSecondaryAccount) {
+            result = result.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
+
         SalaryI18nUtil.i18nList(result);
         return result;
     }
@@ -112,6 +123,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         if (openExtEmp) {
             result.addAll(getExtEmpService(user).listAllForReport());
         }
+        if (!openSecondaryAccount) {
+            result = result.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         SalaryI18nUtil.i18nList(result);
         return result;
     }
@@ -158,6 +172,10 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
 
             includeSalaryEmployees.addAll(extEmps);
         }
+
+        if (!openSecondaryAccount) {
+            includeSalaryEmployees = includeSalaryEmployees.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         SalaryI18nUtil.i18nList(includeSalaryEmployees);
         return includeSalaryEmployees;
     }
@@ -171,6 +189,11 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         if (openExtEmp) {
             employeeList.addAll(getExtEmpService(user).getEmployeeByIds(ids));
         }
+
+        if (!openSecondaryAccount) {
+            employeeList = employeeList.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
+
         SalaryI18nUtil.i18nList(employeeList);
         return employeeList;
     }
@@ -185,6 +208,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
             result.addAll(getExtEmpService(user).getEmployeeByIds(ids));
         }
         result.addAll(employBiz.getEmployeeByIdsAll(ids));
+        if (!openSecondaryAccount) {
+            result = result.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         SalaryI18nUtil.i18nList(result);
         return result;
     }
@@ -214,6 +240,10 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
                 employeeList.addAll(getExtEmpService(user).getEmployeeByIds(longs));
             }
         }
+
+        if (!openSecondaryAccount) {
+            employeeList = employeeList.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(employeeList);
 
     }
@@ -231,6 +261,10 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
                 employeeList.addAll(getExtEmpService(user).getEmployeeByIds(longs));
             }
         }
+
+        if (!openSecondaryAccount) {
+            employeeList = employeeList.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(employeeList);
 
     }
@@ -245,7 +279,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         employeeSameIds = employeeSameIds.stream()
                 .filter(e -> UserStatusEnum.getNormalStatus().contains(e.getStatus()))
                 .collect(Collectors.toList());
-
+        if (!openSecondaryAccount) {
+            employeeSameIds = employeeSameIds.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(employeeSameIds);
     }
 
@@ -271,7 +307,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
             employees = employeeList.stream().filter(e -> (StringUtils.isBlank(idNo) || Objects.equals(e.getIdNo(), idNo)))
                     .collect(Collectors.toList());
         }
-
+        if (!openSecondaryAccount) {
+            employees = employees.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(employees);
 
     }
@@ -284,7 +322,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
      */
     @Override
     public String empValidType() {
-        SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+        SalarySysConfPO salarySysConfPO = getSalarySysConfService(user).getOneByCode("matchEmployeeMode");
         return (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
     }
 
@@ -345,6 +383,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         if (openExtEmp) {
             result.addAll(getExtEmpService(user).listEmployee());
         }
+        if (!openSecondaryAccount) {
+            result = result.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(result);
     }
 
@@ -382,7 +423,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
 
         // 从hrmresource和hrmresourcevirtual可能获取到重复人员数据，需要根据人员id去重
         result = result.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparingLong(DataCollectionEmployee::getEmployeeId))), ArrayList::new));
-
+        if (!openSecondaryAccount) {
+            result = result.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return result;
     }
 
@@ -427,6 +470,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
                         .forEach(e -> e.setExtendData(extendData));
             }
         }
+        if (!openSecondaryAccount) {
+            employees = employees.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(employees);
     }
 
@@ -530,7 +576,11 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         if (CollectionUtils.isEmpty(virtualDepartmentIds)) {
             return Collections.emptyList();
         }
-        return getEmployMapper().listVirtualEmpByVirtualDepIds(virtualDepartmentIds);
+        List<DataCollectionEmployee> employees = getEmployMapper().listVirtualEmpByVirtualDepIds(virtualDepartmentIds);
+        if (!openSecondaryAccount) {
+            employees = employees.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
+        return employees;
     }
 
     @Override
@@ -548,6 +598,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         if (openExtEmp) {
             employeeList.addAll(getExtEmpService(user).listBySubCompanyOrDepartment(subCompanyIds, departmentIds));
         }
+        if (!openSecondaryAccount) {
+            employeeList = employeeList.stream().filter(e -> e.getAccountType() == null || e.getAccountType() == 0).collect(Collectors.toList());
+        }
         return SalaryI18nUtil.i18nList(employeeList);
     }
 
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 30019d8fc..e7fb7c41c 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -40,6 +40,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.enums.AccountTypeEnum;
 import com.engine.salary.enums.OperateTypeEnum;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
@@ -934,6 +935,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
                     .jobtitleId(simpleEmployee.getJobtitleId())
                     .status(simpleEmployee.getStatus() == null ? "" : simpleEmployee.getStatus())
                     .statusName(simpleEmployee.getStatus() == null ? "" : UserStatusEnum.parseByValue(new Integer(Util.null2s(simpleEmployee.getStatus(),"1"))).getDefaultLabel())
+                    .accountTypeName(simpleEmployee.getAccountType() == null ? "" : AccountTypeEnum.parseByValue(simpleEmployee.getAccountType()).getDefaultLabel())
                     .telephone(StringUtils.isEmpty(simpleEmployee.getTelephone()) ? "" : simpleEmployee.getTelephone())
                     .username(StringUtils.isEmpty(simpleEmployee.getUsername()) ? "" : simpleEmployee.getUsername())
                     .workcode(StringUtils.isEmpty(simpleEmployee.getWorkcode()) ? "" : simpleEmployee.getWorkcode())
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index 6f35124c3..fd59edaaf 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -156,4 +156,9 @@ public class SalarySysConstant {
      * 报表组织类型，null/0 ：核算时组织信息    1：实时组织信息
      */
     public static final String REPORT_ORGANIZATIN_TYPE = "REPORT_ORGANIZATIN_TYPE";
+
+    /**
+     * 主次账号开启标识   1开启
+     */
+    public static final String OPEN_SECONDARY_ACCOUNT = "openSecondaryAccount";
 }

From fb8595ac00e36ac6e7f71dd7169127b01da4c8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 16 Oct 2024 18:20:11 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=AC=A1=E8=B4=A6=E5=8F=B7=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/datacollection/DataCollectionEmployee.java | 5 +++--
 src/com/engine/salary/mapper/datacollection/EmployMapper.xml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
index 9c6fa710b..9203785c0 100644
--- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
+++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
@@ -115,13 +115,14 @@ public class DataCollectionEmployee {
     private String idNo;
 
 
-    @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "accountTypeName")
+    @SalaryFormulaVar(defaultLabel = "账号类型", labelId = 98622, dataType = "string")
     private String accountTypeName;
 
     /**
+     * 账号类型
      * 0/null：主账号    1：次账号
      */
-    @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "accountType")
+    @SalaryFormulaVar(defaultLabel = "账号类型编码", labelId = 98622, dataType = "string")
     private Integer accountType;
 
     //是否是系统管理员
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index 149522857..3a2ed14af 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -89,7 +89,6 @@
         left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
         left join hrmjobcall job on e.jobcall=job.id
         where e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
         <if test="collection != null and collection.size()>0">
             AND e.id IN
             <foreach collection="collection" open="(" item="id" separator="," close=")">

From 96a7be5625854584ad8d7475a09fb3120e290f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 18 Oct 2024 11:03:33 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=AC=A1=E8=B4=A6=E5=8F=B7=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryacct/dto/SalaryAccEmployeeListDTO.java       | 10 ++--------
 .../mapper/salaryacct/SalaryAcctEmployeeMapper.xml     |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
index 7f3521ea9..40da19f1d 100644
--- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
+++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
@@ -30,7 +30,7 @@ public class SalaryAccEmployeeListDTO {
     @TableTitle(title = "姓名", dataIndex = "employeeName", key = "employeeName")
     private String employeeName;
 
-    //个税扣缴义务人id")
+    //个税扣缴义务人id
     private Long taxAgentId;
 
 
@@ -38,34 +38,28 @@ public class SalaryAccEmployeeListDTO {
     @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
     private String taxAgentName;
 
-    //部门id")
+    //部门id
     private Long departmentId;
 
 
-    //部门")
     @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
-    //手机号
     @TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile")
     private String mobile;
 
 
-    //工号")
     @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
     private String jobNum;
 
 
-    //员工状态")
     @TableTitle(title = "员工状态", dataIndex = "status", key = "status")
     private String status;
 
-    //员工状态")
     @TableTitle(title = "账号类型", dataIndex = "accountType", key = "accountType")
     private String accountType;
 
 
-    //入职日期")
     @TableTitle(title = "入职日期", dataIndex = "hireDate", key = "hireDate")
     private String hireDate;
 
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index d103313c4..acd416040 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -26,7 +26,7 @@
         <result column="jobcall_id" property="jobcallId"/>
         <result column="status" property="status"/>
         <result column="lock_items" property="lockItems" typeHandler="com.engine.salary.handle.SalaryListTypeHandler"/>
-        <result column="accountType" property="accountType"/>
+        <result column="account_type" property="accountType"/>
     </resultMap>
 
     <resultMap id="SalaryAccEmployeeCountMap"

From 4a7b218ee30198c1c7800e75a58acc58854a4ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 25 Oct 2024 15:19:16 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=AC=A1=E8=B4=A6=E5=8F=B7sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/DM/sql202410250303.sql        | 3 +++
 resource/sqlupgrade/GS/sql202410250303.sql        | 3 +++
 resource/sqlupgrade/JC/sql202410250303.sql        | 3 +++
 resource/sqlupgrade/Mysql/sql202410250303.sql     | 1 +
 resource/sqlupgrade/Oracle/sql202410250303.sql    | 2 ++
 resource/sqlupgrade/PG/sql202410250303.sql        | 1 +
 resource/sqlupgrade/SQLServer/sql202410250303.sql | 2 ++
 resource/sqlupgrade/ST/sql202410250303.sql        | 3 +++
 8 files changed, 18 insertions(+)
 create mode 100644 resource/sqlupgrade/DM/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/GS/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/JC/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/Mysql/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/Oracle/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/PG/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/SQLServer/sql202410250303.sql
 create mode 100644 resource/sqlupgrade/ST/sql202410250303.sql

diff --git a/resource/sqlupgrade/DM/sql202410250303.sql b/resource/sqlupgrade/DM/sql202410250303.sql
new file mode 100644
index 000000000..be178d1f8
--- /dev/null
+++ b/resource/sqlupgrade/DM/sql202410250303.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+
diff --git a/resource/sqlupgrade/GS/sql202410250303.sql b/resource/sqlupgrade/GS/sql202410250303.sql
new file mode 100644
index 000000000..be178d1f8
--- /dev/null
+++ b/resource/sqlupgrade/GS/sql202410250303.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+
diff --git a/resource/sqlupgrade/JC/sql202410250303.sql b/resource/sqlupgrade/JC/sql202410250303.sql
new file mode 100644
index 000000000..be178d1f8
--- /dev/null
+++ b/resource/sqlupgrade/JC/sql202410250303.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+
diff --git a/resource/sqlupgrade/Mysql/sql202410250303.sql b/resource/sqlupgrade/Mysql/sql202410250303.sql
new file mode 100644
index 000000000..c1c7cb26c
--- /dev/null
+++ b/resource/sqlupgrade/Mysql/sql202410250303.sql
@@ -0,0 +1 @@
+ALTER TABLE hrsa_salary_acct_emp ADD COLUMN account_type int(0);
\ No newline at end of file
diff --git a/resource/sqlupgrade/Oracle/sql202410250303.sql b/resource/sqlupgrade/Oracle/sql202410250303.sql
new file mode 100644
index 000000000..d70f10dc0
--- /dev/null
+++ b/resource/sqlupgrade/Oracle/sql202410250303.sql
@@ -0,0 +1,2 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER
+/
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202410250303.sql b/resource/sqlupgrade/PG/sql202410250303.sql
new file mode 100644
index 000000000..7d8b52851
--- /dev/null
+++ b/resource/sqlupgrade/PG/sql202410250303.sql
@@ -0,0 +1 @@
+alter table hrsa_salary_acct_emp add account_type int;
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202410250303.sql b/resource/sqlupgrade/SQLServer/sql202410250303.sql
new file mode 100644
index 000000000..9235eb7dd
--- /dev/null
+++ b/resource/sqlupgrade/SQLServer/sql202410250303.sql
@@ -0,0 +1,2 @@
+ALTER TABLE hrsa_salary_acct_emp ADD account_type int
+GO
\ No newline at end of file
diff --git a/resource/sqlupgrade/ST/sql202410250303.sql b/resource/sqlupgrade/ST/sql202410250303.sql
new file mode 100644
index 000000000..be178d1f8
--- /dev/null
+++ b/resource/sqlupgrade/ST/sql202410250303.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_acct_emp add account_type NUMBER;
+/
+

From 2499d543d8faf1c16eaec2cad237c50f618e62b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 28 Oct 2024 15:11:31 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=BB=E6=AC=A1?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=A1=A3=E6=A1=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/SalaryArchiveServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 12bfa528c..9a238fc78 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -497,7 +497,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
             map.put("username", e.getUsername());
             map.put("employeeId", e.getEmployeeId());
             if (openSecondaryAccount) {
-                map.put("accountType", 1 == e.getAccountType() ? "次账号" : "主账户");
+                map.put("accountType", e.getAccountType() == null || e.getAccountType() == 0 ? "主账号" : "次账号");
             }
 
 //            Optional<Map<String, Object>> optionalTaxAgent = taxAgentData.stream().filter(f -> f.get("salaryArchiveId").toString().equals(e.getId().toString())).findFirst();