diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 5f5b079f4..0e88c304c 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2761,6 +2761,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { String insuranceId = domkey[0].substring(3); if (group.getTitle().contains("个人")) { map.put("title", group.getTitle()); + map.put("titleSign", getTotalSign(group.getTitle())); map.put("paymentScope", "个人"); map.put("insuranceName", item.getLabel()); map.put("insuranceId", insuranceId); @@ -2772,6 +2773,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } else if (group.getTitle().contains("公司")) { map.put("title", group.getTitle()); + map.put("titleSign", getTotalSign(group.getTitle())); map.put("paymentScope", "公司"); map.put("insuranceName", item.getLabel()); map.put("insuranceId", insuranceId); @@ -2815,6 +2817,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return resultMap; } + public String getTotalSign(String total) { + if (StringUtils.isNotBlank(total)) { + return total.contains(SalaryI18nUtil.getI18nLabel(0,"社保")) ? "social" : (total.contains(SalaryI18nUtil.getI18nLabel(0,"公积金")) ? "fund" : "other" ); + } else { + return ""; + } + } public void getPaymentGroup(String baseJson, String groupType, String welfareType, Map dataMap, List addGroups) { if (StringUtils.isBlank(baseJson)) { diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java index 417308adb..89db7ec47 100644 --- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java @@ -154,9 +154,12 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId()); socialMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); - comMap.put("title", welfareTypeName + "公司" + "缴纳"); +// comMap.put("title", welfareTypeName + "公司" + "缴纳"); + comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -164,7 +167,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); - perMap.put("title", welfareTypeName + "个人" + "缴纳"); +// perMap.put("title", welfareTypeName + "个人" + "缴纳"); + perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -179,9 +184,12 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId()); fundMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); - comMap.put("title", welfareTypeName + "公司" + "缴纳"); +// comMap.put("title", welfareTypeName + "公司" + "缴纳"); + comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -189,7 +197,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); - perMap.put("title", welfareTypeName + "个人" + "缴纳"); +// perMap.put("title", welfareTypeName + "个人" + "缴纳"); + perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -204,9 +214,12 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId()); otherMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); - comMap.put("title", welfareTypeName + "公司" + "缴纳"); +// comMap.put("title", welfareTypeName + "公司" + "缴纳"); + comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -214,7 +227,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); - perMap.put("title", welfareTypeName + "个人" + "缴纳"); +// perMap.put("title", welfareTypeName + "个人" + "缴纳"); + perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); diff --git a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java index a2ac565c4..8356cba4e 100644 --- a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java @@ -163,7 +163,9 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { map.put("insuranceBase", entry.getValue()); String welfareTypeName = welfareTypeMap.get(Long.valueOf(entry.getKey())) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(entry.getKey())) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(entry.getKey())) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(entry.getKey())) == 2 ? "fund" : "other" ); map.put("title", welfareTypeName); + map.put("titleSign", welfareTypeSign); resulit.add(map); } } @@ -226,9 +228,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId()); socialMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -237,6 +241,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -251,9 +256,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId()); fundMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -262,6 +269,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -276,9 +284,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId()); otherMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -287,6 +297,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -303,9 +314,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId()); socialMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -314,6 +327,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -334,9 +348,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId()); socialMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -345,6 +361,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -365,9 +382,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId()); socialMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -376,6 +395,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -396,9 +416,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId()); socialMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -407,6 +429,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -423,9 +446,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId()); fundMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -434,6 +459,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); @@ -450,9 +476,11 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { List insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId()); otherMap.forEach((k, v) -> { String welfareTypeName = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" ); + String welfareTypeSign = welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" ); if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue())) { Map comMap = new HashMap<>(); comMap.put("title", welfareTypeName); + comMap.put("titleSign", welfareTypeSign); comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); @@ -461,6 +489,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { Map perMap = new HashMap<>(); perMap.put("title", welfareTypeName); + perMap.put("titleSign", welfareTypeSign); perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人");