From 1eba64edd6898649320cc3bd21a7adf81b2fbffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 4 Aug 2022 15:09:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A6=8F=E5=88=A9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=BA=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?=
 =?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BA=202=E3=80=81=E8=A1=A5=E7=BC=B4?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java               | 2 ++
 .../entity/siaccount/dto/InsuranceAccountViewListDTO.java | 3 +--
 src/com/engine/salary/mapper/InsuranceExportMapper.xml    | 8 ++++----
 .../salary/service/impl/ColumnBuildServiceImpl.java       | 6 +++---
 .../engine/salary/service/impl/SIAccountServiceImpl.java  | 2 +-
 .../engine/salary/service/impl/SIExportServiceImpl.java   | 8 ++++----
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 3912582c9..81a070f06 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -948,6 +948,8 @@ public class SIAccountBiz extends Service {
                         baseParam.getProjects() == null ? new ArrayList<>() : baseParam.getProjects().stream().map(String::valueOf).collect(Collectors.toList())));
         insuranceAccountDetailPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
         insuranceAccountDetailPO.setResourceFrom(ResourceFromEnum.SYSTEM.getValue());
+        //缴纳组织=个税扣缴义务人
+        insuranceAccountDetailPO.setSocialPayOrg(baseParam.getPaymentOrganization());
         if (projects.contains(ProjectTypeEnum.ALL.getValue())) {
             accountSocial(insuranceAccountDetailPO, accountPO);
             accountFund(insuranceAccountDetailPO, accountPO);
diff --git a/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java b/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java
index 64032f67a..11f250657 100644
--- a/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java
+++ b/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java
@@ -3,7 +3,6 @@ package com.engine.salary.entity.siaccount.dto;
 
 import com.cloudstore.eccom.pc.table.WeaTableType;
 import com.engine.salary.annotation.SalaryTable;
-import com.engine.salary.annotation.SalaryTableOperate;
 import com.engine.salary.annotation.TableTitle;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -27,7 +26,7 @@ public class InsuranceAccountViewListDTO {
     @TableTitle(title = "序号", dataIndex = "index", key = "index")
     private Long index;
 
-    @TableTitle(title = "缴纳组织", dataIndex = "payOrg", key = "payOrg")
+    @TableTitle(title = "个税扣缴义务人", dataIndex = "payOrg", key = "payOrg")
     private String payOrg;
 
     @TableTitle(title = "社保人数", dataIndex = "socialNum", key = "socialNum")
diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.xml b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
index 09e71bfee..4b0694c47 100644
--- a/src/com/engine/salary/mapper/InsuranceExportMapper.xml
+++ b/src/com/engine/salary/mapper/InsuranceExportMapper.xml
@@ -3,10 +3,10 @@
 <mapper namespace="com.engine.salary.mapper.InsuranceExportMapper">
     <select id="exportAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO">
         SELECT
-        a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.`STATUS` AS userStatus
+        a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.STATUS AS userStatus
         FROM(
         SELECT * from hrsa_bill_detail
-        WHERE  delete_type = 0 AND bill_month = #{billMonth} AND payment_status = #{paymentStatus} AND social_pay_org = #{paymentOrganization}
+        WHERE  delete_type = 0 AND bill_month = #{billMonth} AND payment_status = #{paymentStatus} AND payment_organization = #{paymentOrganization}
         )a
         LEFT JOIN hrmresource e ON e.ID = a.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
@@ -18,7 +18,7 @@
         a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.STATUS AS userStatus
         FROM(
         SELECT * from hrsa_bill_detail
-        WHERE  delete_type = 0 AND bill_month = #{billMonth} AND payment_status = #{paymentStatus} AND social_pay_org = #{paymentOrganization}
+        WHERE  delete_type = 0 AND bill_month = #{billMonth} AND payment_status = #{paymentStatus} AND payment_organization = #{paymentOrganization}
         )a
         LEFT JOIN hrmresource e ON e.ID = a.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
@@ -30,7 +30,7 @@
         a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.STATUS AS userStatus
         FROM(
         SELECT * from hrsa_bill_detail
-        WHERE  delete_type = 0 AND bill_month = #{billMonth} AND payment_status = #{paymentStatus} AND social_pay_org = #{paymentOrganization}
+        WHERE  delete_type = 0 AND bill_month = #{billMonth} AND payment_status = #{paymentStatus} AND payment_organization = #{paymentOrganization}
         )a
         LEFT JOIN hrmresource e ON e.ID = a.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
diff --git a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
index 49b01278d..95874ec22 100644
--- a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
+++ b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
@@ -52,14 +52,14 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
         if (flag) {
             list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 100379, "补缴月份"), "supplementaryMonth"));
         }
-        list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91325, "社保缴纳组织"), "socialPayOrg"));
+        list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91325, "个税扣缴义务人"), "socialPayOrg"));
         list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91324, "社保账号"), "socialAccount"));
         list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91323, "社保方案名称"), "socialSchemeName"));
         //组装社保基数
         columns.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> {
             list.add(new WeaTableColumn("150px",k, v));
         });
-        list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91488, "公积金缴纳组织"), "fundPayOrg"));
+//        list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91488, "公积金缴纳组织"), "fundPayOrg"));
         list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91486, "公积金账号"), "fundAccount"));
         list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91485, "公积金方案名称"), "fundSchemeName"));
         //组装公积金基数
@@ -67,7 +67,7 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
             list.add(new WeaTableColumn("150px",k, v));
         });
         list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91487, "补充公积金账号"), "supplementFundAccount"));
-        list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91497, "其他福利缴纳组织"), "otherPayOrg"));
+//        list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91497, "其他福利缴纳组织"), "otherPayOrg"));
         list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherSchemeName"));
         columns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
             list.add(new WeaTableColumn("150px",k, v));
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index b04455006..c0aacf6e6 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -244,7 +244,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
 
         //动态列组装
-        List<WeaTableColumn> weaTableColumn = getColumnBuildService(user).buildCommonColumnsWithStyle(insuranceAccountDetailPOS, employeeId, SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY, false);
+        List<WeaTableColumn> weaTableColumn = getColumnBuildService(user).buildCommonColumnsWithStyle(insuranceAccountDetailPOS, employeeId, SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY, true);
 
         SalaryWeaTable<InsuranceAccountDetailPO> table = new SalaryWeaTable<>(user, InsuranceAccountDetailPO.class);
         table.setColumns(weaTableColumn);
diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
index 1b4936225..d62253b94 100644
--- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
@@ -72,7 +72,7 @@ public class SIExportServiceImpl extends Service implements SIExportService {
         String sheetName = SalaryI18nUtil.getI18nLabel(85368, "社保福利档案");
         // 2.表头
         String[] header = {
-                SalaryI18nUtil.getI18nLabel(93270, "缴纳组织"),
+                SalaryI18nUtil.getI18nLabel(93270, "个税扣缴义务人"),
                 SalaryI18nUtil.getI18nLabel(93272, "社保人数"),
                 SalaryI18nUtil.getI18nLabel(93273, "公积金人数"),
                 SalaryI18nUtil.getI18nLabel(93274, "其他福利人数"),
@@ -398,14 +398,14 @@ public class SIExportServiceImpl extends Service implements SIExportService {
         if (flag) {
             list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100379, "补缴月份"), "supplementaryMonth"));
         }
-        list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91325, "社保缴纳组织"), "socialPayOrg"));
+        list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"), "socialPayOrg"));
         list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91324, "社保账号"), "socialAccount"));
         list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91323, "社保方案名称"), "socialSchemeName"));
         //组装社保基数
         columns.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> {
             list.add(new WeaTableColumn("150px", k, v));
         });
-        list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91488, "公积金缴纳组织"), "fundPayOrg"));
+//        list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91488, "公积金缴纳组织"), "fundPayOrg"));
         list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91486, "公积金账号"), "fundAccount"));
         list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称"), "fundSchemeName"));
         //组装公积金基数
@@ -413,7 +413,7 @@ public class SIExportServiceImpl extends Service implements SIExportService {
             list.add(new WeaTableColumn("150px", k, v));
         });
         list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号"), "supplementFundAccount"));
-        list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91497, "其他福利缴纳组织"), "otherPayOrg"));
+//        list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91497, "其他福利缴纳组织"), "otherPayOrg"));
         list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherSchemeName"));
         columns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
             list.add(new WeaTableColumn("150px", k, v));