From a91b411c08c54fca3d3ef1e7b4438e272cdb62aa 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 16:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8D=83=E5=88=86=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java | 34 +++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 89d8a1216..238de84fe 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -710,7 +710,7 @@ public class SIArchivesBiz {
                 page = socialSchemeMapper.queryEmployeeList(param);
                 page = page.stream().filter(f ->
 //                        taxAgentEmployeeIds.contains(f.getEmployeeId())||
-                        taxAgentIds.contains(f.getPaymentOrganization())
+                                taxAgentIds.contains(f.getPaymentOrganization())
                 ).collect(Collectors.toList());
                 // 填充总数和当页数据
                 // 分页参数
@@ -724,10 +724,10 @@ public class SIArchivesBiz {
                 pageInfo = new PageInfo<>(page, InsuranceArchivesEmployeePO.class);
             }
             List<Map<String, Object>> records = null;
-            if (param.getExportData() != null && param.getExportData()){
-                records = buildTableData(page,true);
-            }else {
-                records = buildTableData(page,false);
+            if (param.getExportData() != null && param.getExportData()) {
+                records = buildTableData(page, true);
+            } else {
+                records = buildTableData(page, false);
             }
             List<WeaTableColumn> columns = buildWeaTableColumns(page, operateId);
 
@@ -890,15 +890,15 @@ public class SIArchivesBiz {
     }
 
 
-    public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS){
-        return buildTableData(insuranceArchivesEmployeePOS,false);
+    public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS) {
+        return buildTableData(insuranceArchivesEmployeePOS, false);
     }
 
     /**
      * @param insuranceArchivesEmployeePOS
      * @return
      */
-    public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS,boolean export) {
+    public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS, boolean export) {
         List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listAll();
         Map<Long, TaxAgentPO> longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId);
 
@@ -942,11 +942,7 @@ public class SIArchivesBiz {
                     Map<String, Object> socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference<Map<String, Object>>() {
                     });
                     if (socialJson != null) {
-                        if (export){
-                            map.putAll(socialJson);
-                        }else {
-                            SalaryEntityUtil.thousandthConvert(socialJson, map);
-                        }
+                        map.putAll(socialJson);
                     }
                     map.put("socialAccount", socialItem.getSocialAccount());
                     map.put("socialStartTime", socialItem.getSocialStartTime());
@@ -958,11 +954,7 @@ public class SIArchivesBiz {
                     Map<String, Object> fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference<Map<String, Object>>() {
                     });
                     if (fundJson != null) {
-                        if (export){
-                            map.putAll(fundJson);
-                        }else {
-                            SalaryEntityUtil.thousandthConvert(fundJson, map);
-                        }
+                        map.putAll(fundJson);
                     }
                     map.put("supplementFundAccount", fundItem.getSupplementFundAccount());
                     map.put("fundStartTime", fundItem.getFundStartTime());
@@ -974,11 +966,7 @@ public class SIArchivesBiz {
                     Map<String, Object> otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference<Map<String, Object>>() {
                     });
                     if (otherJson != null) {
-                        if (export){
-                            map.putAll(otherJson);
-                        }else {
-                            SalaryEntityUtil.thousandthConvert(otherJson, map);
-                        }
+                        map.putAll(otherJson);
                     }
                     map.put("otherStartTime", otherItem.getOtherStartTime());
                     map.put("otherEndTime", otherItem.getOtherEndTime());