From f93090b063c502842013d8a641d8efc445e4db55 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 17 Jul 2023 17:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96=E6=9C=AA?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AD=97=E6=AE=B5=E8=AF=86=E5=88=AB=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctExcelServiceImpl.java      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 486073fbf..3e808cb80 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -44,6 +44,7 @@ import com.engine.salary.util.excel.ExcelSupport;
 import com.engine.salary.util.excel.ExcelUtilPlus;
 import com.engine.salary.util.page.Column;
 import com.engine.salary.util.valid.ValidUtil;
+import com.engine.salary.wrapper.SalarySobItemWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -102,10 +103,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return (SalaryItemService) ServiceUtil.getService(SalaryItemServiceImpl.class, user);
     }
 
-//    private SalaryFormulaService getSalaryFormulaService(User user) {
-//        return (SalaryFormulaService) ServiceUtil.getService(SalaryFormulaServiceImpl.class, user);
-//    }
-
     private SalaryComparisonResultService getSalaryComparisonResultService(User user) {
         return (SalaryComparisonResultService) ServiceUtil.getService(SalaryComparisonResultServiceImpl.class, user);
     }
@@ -123,12 +120,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user);
     }
 
-    private SalaryCheckResultService salaryCheckResultService;
-
-    private SalaryCheckResultDetailService salaryCheckResultDetailService;
-
-    private SalarySobCheckRuleService salarySobCheckRuleService;
-
     private SalaryAcctReportService getSalaryAcctReportService(User user) {
         return ServiceUtil.getService(SalaryAcctReportServiceImpl.class, user);
     }
@@ -145,6 +136,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return ServiceUtil.getService(SalaryAcctResultLogServiceImpl.class, user);
     }
 
+    private SalarySobItemWrapper getSalarySobItemWrapper(User user) {
+        return ServiceUtil.getService(SalarySobItemWrapper.class, user);
+    }
+
     @Override
     public XSSFWorkbook exportSalaryAcctEmployee(SalaryAcctEmployeeQueryParam queryParam) {
         ValidUtil.doValidator(queryParam);
@@ -291,6 +286,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         //判断是否按照自定义字段导出表头
         List<WeaTableColumnGroup> finalWeaTableColumns = new ArrayList<>();
         if (queryParam.getSalaryItemIds() != null ) {
+            //获取人员基本信息字段（汇总）
+            Collection<Map<String, String>> empFieldList = getSalarySobItemWrapper(user).empFieldList();
+            List<String> empFieldIdList= new ArrayList<>();
+            empFieldList.forEach(f -> empFieldIdList.add(f.get("id")));
             // 必须选择导出所需的薪资项目
             if (CollectionUtils.isEmpty(queryParam.getSalaryItemIds())) {
                 throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99019, "参数错误，请选择导入模板所需的薪资项目"));
@@ -308,7 +307,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                         columnGroupItem.setChildren(childrenColumns);
                         finalWeaTableColumns.add(columnGroupItem);
                     }
-                } else if (headerRangeList.contains(columnGroupItem.getColumn())) {
+                } else if (empFieldIdList.contains(tableColumn.getColumn()) || headerRangeList.contains(tableColumn.getColumn())){
                     finalWeaTableColumns.add(columnGroupItem);
                 }
 
@@ -319,7 +318,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
 //        parseHeader(headerColumnGroup, weaTableColumns);
         parseHeader(headerColumnGroup, finalWeaTableColumns);
 //        // excel导出的表头
-        List<Object> headerList = new ArrayList<>(weaTableColumns);
+//        List<Object> headerList = new ArrayList<>(weaTableColumns);
+        List<Object> headerList = new ArrayList<>(finalWeaTableColumns);
         // 查询薪资核算结果
         List<Map<String, Object>> resultMapList = getSalaryAcctResultService(user).listByParam(queryParam);