From 8fbf461cc4831ea7186ddd220a9d4e2cb5a7b1bf Mon Sep 17 00:00:00 2001 From: Harryxzy <822365880@qq.com> Date: Fri, 5 Sep 2025 14:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/SalaryAcctManager.java | 2 +- .../salary/service/RemoteExcelService.java | 2 +- .../salary/service/SIAccountService.java | 2 +- .../service/impl/RemoteExcelServiceImpl.java | 10 +- .../service/impl/SIAccountServiceImpl.java | 375 +++++++++++------- .../impl/SalaryAcctResultServiceImpl.java | 2 +- .../salary/wrapper/SalaryFormulaWrapper.java | 4 +- 7 files changed, 249 insertions(+), 148 deletions(-) diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java index 289b898bd..f7847e6cb 100644 --- a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java +++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java @@ -257,7 +257,7 @@ public class SalaryAcctManager extends Service { // 5、查询薪资核算记录所用薪资账套的调薪计薪规则 List salarySobAdjustRulePOS = getSalarySobAdjustRuleService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); // 6、查询社保福利的所有字段 - Map welfareColumns = getSIAccountService(user).welfareColumns(); + Map welfareColumns = getSIAccountService(user).welfareColumns(false); // 7、查询考勤引用的所有字段 List attendQuoteFieldListDTOS = getAttendQuoteFieldService(user).listAll(); diff --git a/src/com/engine/salary/service/RemoteExcelService.java b/src/com/engine/salary/service/RemoteExcelService.java index 2d657dd8e..e8b50c7e3 100644 --- a/src/com/engine/salary/service/RemoteExcelService.java +++ b/src/com/engine/salary/service/RemoteExcelService.java @@ -12,7 +12,7 @@ public interface RemoteExcelService { // // ExcelPage categoryList(ExcelPage page, Map extendParam, DataCollectionEmployee employee); - List fieldList(String sourceId, Map extendParam); + List fieldList(String sourceId, Map extendParam, Boolean isImport); List> fieldGroupList(Map extendParam); diff --git a/src/com/engine/salary/service/SIAccountService.java b/src/com/engine/salary/service/SIAccountService.java index 4463bd73a..3ac76ef52 100644 --- a/src/com/engine/salary/service/SIAccountService.java +++ b/src/com/engine/salary/service/SIAccountService.java @@ -214,7 +214,7 @@ public interface SIAccountService { * * @return */ - Map welfareColumns(); + Map welfareColumns(Boolean isImport); /** * 根据条件获取所有的核算异常明细 diff --git a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java index 8a447abba..bf68a8019 100644 --- a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java @@ -107,7 +107,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic // } @Override - public List fieldList(String sourceId, Map extendParam) { + public List fieldList(String sourceId, Map extendParam, Boolean isImport) { List vars = new ArrayList<>(); @@ -163,7 +163,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic vars = convert2FormulaVar(OtherDeductionPO.class, referenceEnum.getValue() + ""); break; case WELFARE: - vars = welfare2FormulaVar(referenceEnum); + vars = welfare2FormulaVar(referenceEnum, isImport); break; case ATTEND: vars = attendData2FormulaVar(referenceEnum); @@ -257,7 +257,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic result.put(SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getDefaultLabel(), convert2FormulaVar(OtherDeductionPO.class, SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getValue() + "")); result.put(SalaryFormulaReferenceEnum.WELFARE.getDefaultLabel(), - welfare2FormulaVar(SalaryFormulaReferenceEnum.WELFARE)); + welfare2FormulaVar(SalaryFormulaReferenceEnum.WELFARE, false)); result.put(SalaryFormulaReferenceEnum.ATTEND.getDefaultLabel(), attendData2FormulaVar(SalaryFormulaReferenceEnum.ATTEND)); result.put(SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel(), @@ -458,8 +458,8 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic return formulaVars; } - private List welfare2FormulaVar(SalaryFormulaReferenceEnum referenceEnum) { - Map welfareColumns = getSIAccountService(user).welfareColumns(); + private List welfare2FormulaVar(SalaryFormulaReferenceEnum referenceEnum, Boolean isImport) { + Map welfareColumns = getSIAccountService(user).welfareColumns(isImport); if (MapUtils.isEmpty(welfareColumns)) { return null; } diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index c7b6e1bd8..f9873ba0f 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1183,7 +1183,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } @Override - public Map welfareColumns() { + public Map welfareColumns(Boolean isImport) { List listAll = getICategoryMapper().listAll().stream().filter(f -> f.getIsUse().equals(IsUseEnum.START.getValue())).collect(Collectors.toList()); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(listAll)) { @@ -1192,123 +1192,97 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Map result = new LinkedHashMap<>(); - // 获取所有个税扣缴义务人 - List allTaxAgentList = getTaxAgentService(user).listAll(); - // 获取所有社保方案 - List socialSchemeList = getInsuranceSchemeMapper().listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue()); - List fundSchemeList = getInsuranceSchemeMapper().listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue()); - List otherSchemeList = getInsuranceSchemeMapper().listByWelfareType(WelfareTypeEnum.OTHER.getValue()); - - for (InsuranceSchemePO socialScheme : socialSchemeList) { + if (isImport != null && isImport.equals(true)) { Map commonResult = new LinkedHashMap<>(); Map repairResult = new LinkedHashMap<>(); Map balanceResult = new LinkedHashMap<>(); Map baseResult = new LinkedHashMap<>(); - String socialSchemeNameFlag = socialScheme.getSchemeName() + "_"; - String socialSchemeIdFlag = socialScheme.getId() + "_"; + result.put(SalaryI18nUtil.getI18nLabel(100393, "个人合计"), "perSum"); + result.put(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), "socialPerSum"); + result.put(SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), "fundPerSum"); + result.put(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum"); - result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100393, "个人合计"), socialSchemeIdFlag + "perSum"); - result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), socialSchemeIdFlag + "socialPerSum"); - // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), taxAgentIdFlag + "fundPerSum"); - // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), taxAgentIdFlag + "otherPerSum"); - - commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), socialSchemeIdFlag + "perCommonSum"); - commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), socialSchemeIdFlag + "socialPerCommonSum"); - // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), taxAgentIdFlag + "fundPerCommonSum"); - // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), taxAgentIdFlag + "otherPerCommonSum"); - repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), socialSchemeIdFlag + "perRepairSum"); - repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), socialSchemeIdFlag + "socialPerRepairSum"); - // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), taxAgentIdFlag + "fundPerRepairSum"); - // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), taxAgentIdFlag + "otherPerRepairSum"); - balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), socialSchemeIdFlag + "perBalanceSum"); - balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), socialSchemeIdFlag + "socialPerBalanceSum"); - // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), taxAgentIdFlag + "fundPerBalanceSum"); - // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), taxAgentIdFlag + "otherPerBalanceSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), "perCommonSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), "socialPerCommonSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), "fundPerCommonSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), "otherPerCommonSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), "perRepairSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), "socialPerRepairSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), "fundPerRepairSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), "otherPerRepairSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), "perBalanceSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), "socialPerBalanceSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), "fundPerBalanceSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), "otherPerBalanceSum"); Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); list.stream().forEach(item -> { if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { - baseResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), socialSchemeIdFlag + item.getId() + "socialBase"); + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), item.getId() + "socialBase"); } - result.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), socialSchemeIdFlag + item.getId() + "socialPer"); - commonResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), socialSchemeIdFlag + item.getId() + "socialCommonPer"); - repairResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), socialSchemeIdFlag + item.getId() + "socialRepairPer"); - balanceResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), socialSchemeIdFlag + item.getId() + "socialBalancePer"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "socialPer"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "socialCommonPer"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "socialRepairPer"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "socialBalancePer"); + } + if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), item.getId() + "fundBase"); + } + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "fundPer"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "fundCommonPer"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "fundRepairPer"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "fundBalancePer"); + } + if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), item.getId() + "otherBase"); + } + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "otherPer"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "otherCommonPer"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "otherRepairPer"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "otherBalancePer"); } - }); - result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100397, "单位合计"), socialSchemeIdFlag + "comSum"); - result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100394, "社保单位合计"), socialSchemeIdFlag + "socialComSum"); - // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), taxAgentIdFlag + "fundComSum"); - // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), taxAgentIdFlag + "otherComSum"); - commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), socialSchemeIdFlag + "comCommonSum"); - commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), socialSchemeIdFlag + "socialComCommonSum"); - // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), taxAgentIdFlag + "fundComCommonSum"); - // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), taxAgentIdFlag + "otherComCommonSum"); - repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), socialSchemeIdFlag + "comRepairSum"); - repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), socialSchemeIdFlag + "socialComRepairSum"); - // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), taxAgentIdFlag + "fundComRepairSum"); - // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), taxAgentIdFlag + "otherComRepairSum"); - balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), socialSchemeIdFlag + "comBalanceSum"); - balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), socialSchemeIdFlag + "socialComBalanceSum"); - // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), taxAgentIdFlag + "fundComBalanceSum"); - // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), taxAgentIdFlag + "otherComBalanceSum"); + }); + result.put(SalaryI18nUtil.getI18nLabel(100397, "单位合计"), "comSum"); + result.put(SalaryI18nUtil.getI18nLabel(100394, "社保单位合计"), "socialComSum"); + result.put(SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), "fundComSum"); + result.put(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum"); + + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), "comCommonSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), "socialComCommonSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), "fundComCommonSum"); + commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), "otherComCommonSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), "comRepairSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), "socialComRepairSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), "fundComRepairSum"); + repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), "otherComRepairSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), "comBalanceSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), "socialComBalanceSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), "fundComBalanceSum"); + balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), "otherComBalanceSum"); list.stream().forEach(item -> { if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { - result.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), socialSchemeIdFlag + item.getId() + "socialCom"); - commonResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), socialSchemeIdFlag + item.getId() + "socialCommonCom"); - repairResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), socialSchemeIdFlag + item.getId() + "socialRepairCom"); - balanceResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), socialSchemeIdFlag + item.getId() + "socialBalanceCom"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "socialCom"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), item.getId() + "socialCommonCom"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), item.getId() + "socialRepairCom"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), item.getId() + "socialBalanceCom"); } - }); - - result.putAll(baseResult); - result.putAll(commonResult); - result.putAll(repairResult); - result.putAll(balanceResult); - } - for (InsuranceSchemePO fundScheme : fundSchemeList) { - Map commonResult = new LinkedHashMap<>(); - Map repairResult = new LinkedHashMap<>(); - Map balanceResult = new LinkedHashMap<>(); - Map baseResult = new LinkedHashMap<>(); - - String fundSchemeNameFlag = fundScheme.getSchemeName() + "_"; - String fundSchemeIdFlag = fundScheme.getId() + "_"; - - result.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), fundSchemeIdFlag + "fundPerSum"); - commonResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), fundSchemeIdFlag + "fundPerCommonSum"); - repairResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), fundSchemeIdFlag + "fundPerRepairSum"); - balanceResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), fundSchemeIdFlag + "fundPerBalanceSum"); - - Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); - list.stream().forEach(item -> { if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { - if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { - baseResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), fundSchemeIdFlag + item.getId() + "fundBase"); - } - result.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), fundSchemeIdFlag + item.getId() + "fundPer"); - commonResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), fundSchemeIdFlag + item.getId() + "fundCommonPer"); - repairResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), fundSchemeIdFlag + item.getId() + "fundRepairPer"); - balanceResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), fundSchemeIdFlag + item.getId() + "fundBalancePer"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "fundCom"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), item.getId() + "fundCommonCom"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), item.getId() + "fundRepairCom"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), item.getId() + "fundBalanceCom"); } - - }); - result.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), fundSchemeIdFlag + "fundComSum"); - - commonResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), fundSchemeIdFlag + "fundComCommonSum"); - repairResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), fundSchemeIdFlag + "fundComRepairSum"); - balanceResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), fundSchemeIdFlag + "fundComBalanceSum"); - - list.stream().forEach(item -> { - if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { - result.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), fundSchemeIdFlag + item.getId() + "fundCom"); - commonResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), fundSchemeIdFlag + item.getId() + "fundCommonCom"); - repairResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), fundSchemeIdFlag + item.getId() + "fundRepairCom"); - balanceResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), fundSchemeIdFlag + item.getId() + "fundBalanceCom"); + if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "otherCom"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), item.getId() + "otherCommonCom"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), item.getId() + "otherRepairCom"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), item.getId() + "otherBalanceCom"); } }); @@ -1316,56 +1290,183 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { result.putAll(commonResult); result.putAll(repairResult); result.putAll(balanceResult); - } - for (InsuranceSchemePO otherScheme : otherSchemeList) { - Map commonResult = new LinkedHashMap<>(); - Map repairResult = new LinkedHashMap<>(); - Map balanceResult = new LinkedHashMap<>(); - Map baseResult = new LinkedHashMap<>(); + return result; + } else { + // 获取所有社保方案 + List socialSchemeList = getInsuranceSchemeMapper().listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue()); + List fundSchemeList = getInsuranceSchemeMapper().listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue()); + List otherSchemeList = getInsuranceSchemeMapper().listByWelfareType(WelfareTypeEnum.OTHER.getValue()); - String otherSchemeNameFlag = otherScheme.getSchemeName() + "_"; - String otherSchemeIdFlag = otherScheme.getId() + "_"; + for (InsuranceSchemePO socialScheme : socialSchemeList) { + Map commonResult = new LinkedHashMap<>(); + Map repairResult = new LinkedHashMap<>(); + Map balanceResult = new LinkedHashMap<>(); + Map baseResult = new LinkedHashMap<>(); + String socialSchemeNameFlag = socialScheme.getSchemeName() + "_"; + String socialSchemeIdFlag = socialScheme.getId() + "_"; - result.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), otherSchemeIdFlag + "otherPerSum"); - commonResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), otherSchemeIdFlag + "otherPerCommonSum"); - repairResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), otherSchemeIdFlag + "otherPerRepairSum"); - balanceResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), otherSchemeIdFlag + "otherPerBalanceSum"); + result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100393, "个人合计"), socialSchemeIdFlag + "perSum"); + result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), socialSchemeIdFlag + "socialPerSum"); + // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), taxAgentIdFlag + "fundPerSum"); + // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), taxAgentIdFlag + "otherPerSum"); - Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); - list.stream().forEach(item -> { - if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { - if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { - baseResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"),otherSchemeIdFlag + item.getId() + "otherBase"); + commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), socialSchemeIdFlag + "perCommonSum"); + commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), socialSchemeIdFlag + "socialPerCommonSum"); + // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), taxAgentIdFlag + "fundPerCommonSum"); + // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), taxAgentIdFlag + "otherPerCommonSum"); + repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), socialSchemeIdFlag + "perRepairSum"); + repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), socialSchemeIdFlag + "socialPerRepairSum"); + // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), taxAgentIdFlag + "fundPerRepairSum"); + // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), taxAgentIdFlag + "otherPerRepairSum"); + balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), socialSchemeIdFlag + "perBalanceSum"); + balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), socialSchemeIdFlag + "socialPerBalanceSum"); + // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), taxAgentIdFlag + "fundPerBalanceSum"); + // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), taxAgentIdFlag + "otherPerBalanceSum"); + + Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); + list.stream().forEach(item -> { + if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), socialSchemeIdFlag + item.getId() + "socialBase"); + } + result.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), socialSchemeIdFlag + item.getId() + "socialPer"); + commonResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), socialSchemeIdFlag + item.getId() + "socialCommonPer"); + repairResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), socialSchemeIdFlag + item.getId() + "socialRepairPer"); + balanceResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), socialSchemeIdFlag + item.getId() + "socialBalancePer"); } - result.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), otherSchemeIdFlag + item.getId() + "otherPer"); - commonResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), otherSchemeIdFlag + item.getId() + "otherCommonPer"); - repairResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), otherSchemeIdFlag + item.getId() + "otherRepairPer"); - balanceResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), otherSchemeIdFlag + item.getId() + "otherBalancePer"); - } + }); + result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100397, "单位合计"), socialSchemeIdFlag + "comSum"); + result.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100394, "社保单位合计"), socialSchemeIdFlag + "socialComSum"); + // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), taxAgentIdFlag + "fundComSum"); + // result.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), taxAgentIdFlag + "otherComSum"); - }); - result.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), otherSchemeIdFlag + "otherComSum"); + commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), socialSchemeIdFlag + "comCommonSum"); + commonResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), socialSchemeIdFlag + "socialComCommonSum"); + // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), taxAgentIdFlag + "fundComCommonSum"); + // commonResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), taxAgentIdFlag + "otherComCommonSum"); + repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), socialSchemeIdFlag + "comRepairSum"); + repairResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), socialSchemeIdFlag + "socialComRepairSum"); + // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), taxAgentIdFlag + "fundComRepairSum"); + // repairResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), taxAgentIdFlag + "otherComRepairSum"); + balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), socialSchemeIdFlag + "comBalanceSum"); + balanceResult.put(socialSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), socialSchemeIdFlag + "socialComBalanceSum"); + // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), taxAgentIdFlag + "fundComBalanceSum"); + // balanceResult.put(taxAgentNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), taxAgentIdFlag + "otherComBalanceSum"); - commonResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), otherSchemeIdFlag + "otherComCommonSum"); - repairResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), otherSchemeIdFlag + "otherComRepairSum"); - balanceResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), otherSchemeIdFlag + "otherComBalanceSum"); + list.stream().forEach(item -> { + if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { + result.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), socialSchemeIdFlag + item.getId() + "socialCom"); + commonResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), socialSchemeIdFlag + item.getId() + "socialCommonCom"); + repairResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), socialSchemeIdFlag + item.getId() + "socialRepairCom"); + balanceResult.put(socialSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), socialSchemeIdFlag + item.getId() + "socialBalanceCom"); + } + }); - list.stream().forEach(item -> { - if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { - result.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), otherSchemeIdFlag + item.getId() + "otherCom"); - commonResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), otherSchemeIdFlag + item.getId() + "otherCommonCom"); - repairResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), otherSchemeIdFlag + item.getId() + "otherRepairCom"); - balanceResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), otherSchemeIdFlag + item.getId() + "otherBalanceCom"); - } - }); + result.putAll(baseResult); + result.putAll(commonResult); + result.putAll(repairResult); + result.putAll(balanceResult); + } + for (InsuranceSchemePO fundScheme : fundSchemeList) { + Map commonResult = new LinkedHashMap<>(); + Map repairResult = new LinkedHashMap<>(); + Map balanceResult = new LinkedHashMap<>(); + Map baseResult = new LinkedHashMap<>(); - result.putAll(baseResult); - result.putAll(commonResult); - result.putAll(repairResult); - result.putAll(balanceResult); + String fundSchemeNameFlag = fundScheme.getSchemeName() + "_"; + String fundSchemeIdFlag = fundScheme.getId() + "_"; + + result.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), fundSchemeIdFlag + "fundPerSum"); + commonResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), fundSchemeIdFlag + "fundPerCommonSum"); + repairResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), fundSchemeIdFlag + "fundPerRepairSum"); + balanceResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), fundSchemeIdFlag + "fundPerBalanceSum"); + + Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); + list.stream().forEach(item -> { + if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), fundSchemeIdFlag + item.getId() + "fundBase"); + } + result.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), fundSchemeIdFlag + item.getId() + "fundPer"); + commonResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), fundSchemeIdFlag + item.getId() + "fundCommonPer"); + repairResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), fundSchemeIdFlag + item.getId() + "fundRepairPer"); + balanceResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), fundSchemeIdFlag + item.getId() + "fundBalancePer"); + } + + }); + result.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), fundSchemeIdFlag + "fundComSum"); + + commonResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), fundSchemeIdFlag + "fundComCommonSum"); + repairResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), fundSchemeIdFlag + "fundComRepairSum"); + balanceResult.put(fundSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), fundSchemeIdFlag + "fundComBalanceSum"); + + list.stream().forEach(item -> { + if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { + result.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), fundSchemeIdFlag + item.getId() + "fundCom"); + commonResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), fundSchemeIdFlag + item.getId() + "fundCommonCom"); + repairResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), fundSchemeIdFlag + item.getId() + "fundRepairCom"); + balanceResult.put(fundSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), fundSchemeIdFlag + item.getId() + "fundBalanceCom"); + } + }); + + result.putAll(baseResult); + result.putAll(commonResult); + result.putAll(repairResult); + result.putAll(balanceResult); + } + for (InsuranceSchemePO otherScheme : otherSchemeList) { + Map commonResult = new LinkedHashMap<>(); + Map repairResult = new LinkedHashMap<>(); + Map balanceResult = new LinkedHashMap<>(); + Map baseResult = new LinkedHashMap<>(); + + String otherSchemeNameFlag = otherScheme.getSchemeName() + "_"; + String otherSchemeIdFlag = otherScheme.getId() + "_"; + + + result.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), otherSchemeIdFlag + "otherPerSum"); + commonResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), otherSchemeIdFlag + "otherPerCommonSum"); + repairResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), otherSchemeIdFlag + "otherPerRepairSum"); + balanceResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), otherSchemeIdFlag + "otherPerBalanceSum"); + + Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); + list.stream().forEach(item -> { + if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"),otherSchemeIdFlag + item.getId() + "otherBase"); + } + result.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), otherSchemeIdFlag + item.getId() + "otherPer"); + commonResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), otherSchemeIdFlag + item.getId() + "otherCommonPer"); + repairResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), otherSchemeIdFlag + item.getId() + "otherRepairPer"); + balanceResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), otherSchemeIdFlag + item.getId() + "otherBalancePer"); + } + + }); + result.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), otherSchemeIdFlag + "otherComSum"); + + commonResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), otherSchemeIdFlag + "otherComCommonSum"); + repairResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), otherSchemeIdFlag + "otherComRepairSum"); + balanceResult.put(otherSchemeNameFlag + SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), otherSchemeIdFlag + "otherComBalanceSum"); + + list.stream().forEach(item -> { + if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { + result.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), otherSchemeIdFlag + item.getId() + "otherCom"); + commonResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), otherSchemeIdFlag + item.getId() + "otherCommonCom"); + repairResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), otherSchemeIdFlag + item.getId() + "otherRepairCom"); + balanceResult.put(otherSchemeNameFlag + categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), otherSchemeIdFlag + item.getId() + "otherBalanceCom"); + } + }); + + result.putAll(baseResult); + result.putAll(commonResult); + result.putAll(repairResult); + result.putAll(balanceResult); + } } + + // for (TaxAgentPO taxAgentPO : allTaxAgentList) { // Map commonResult = new LinkedHashMap<>(); // Map repairResult = new LinkedHashMap<>(); diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 0c093a6d1..452ad8d85 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -817,7 +817,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 5、查询薪资核算记录所用薪资账套的调薪计薪规则 List salarySobAdjustRulePOS = getSalarySobAdjustRuleService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); // 6、查询社保福利的所有字段 - Map welfareColumns = getSIAccountService(user).welfareColumns(); + Map welfareColumns = getSIAccountService(user).welfareColumns(false); // 7、查询考勤引用的所有字段 List attendQuoteFieldListDTOS = getAttendQuoteFieldService(user).listAll(); List variableItemPOS = getVariableItemService(user).listAll(); diff --git a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java index 1c62d921c..331c9d59a 100644 --- a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java @@ -70,7 +70,7 @@ public class SalaryFormulaWrapper extends Service { * @return */ public List fieldList(SalaryFormulaFieldQueryParam param) { - return getRemoteExcelService(user).fieldList(param.getSourceId(), param.getExtendParam()); + return getRemoteExcelService(user).fieldList(param.getSourceId(), param.getExtendParam(), false); } @@ -113,7 +113,7 @@ public class SalaryFormulaWrapper extends Service { SalaryFormulaFieldQueryParam param = new SalaryFormulaFieldQueryParam(); param.setSourceId("welfare"); //获取福利类薪资项目 - List list = getRemoteExcelService(user).fieldList(param.getSourceId(), param.getExtendParam()); + List list = getRemoteExcelService(user).fieldList(param.getSourceId(), param.getExtendParam(), true); list = list.stream().filter(f -> !(f.getName().contains("正常缴纳") || f.getName().contains("补缴") || f.getName().contains("补差") || f.getName().contains("申报基数"))).collect(Collectors.toList()); //提取出福利类项目名称 for (FormulaVar formulaVar : list) {