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> 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 columns = buildWeaTableColumns(page, operateId); @@ -890,15 +890,15 @@ public class SIArchivesBiz { } - public List> buildTableData(List insuranceArchivesEmployeePOS){ - return buildTableData(insuranceArchivesEmployeePOS,false); + public List> buildTableData(List insuranceArchivesEmployeePOS) { + return buildTableData(insuranceArchivesEmployeePOS, false); } /** * @param insuranceArchivesEmployeePOS * @return */ - public List> buildTableData(List insuranceArchivesEmployeePOS,boolean export) { + public List> buildTableData(List insuranceArchivesEmployeePOS, boolean export) { List taxAgentPOS = getTaxAgentMapper().listAll(); Map longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId); @@ -942,11 +942,7 @@ public class SIArchivesBiz { Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { }); 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 fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { }); 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 otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { }); 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());