diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index d4714367d..18ccbca35 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2140,5 +2140,112 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return excelInsuranceDetailPO; } +// @Override +// public InsuranceSupplementListFoldDTO getPaymentById(Long id) { +// InsuranceSupplementListFoldDTO result = new InsuranceSupplementListFoldDTO(); +// WeaTable weaTable = new WeaTable<>(); +// EditableTable editableTable = new EditableTable<>(weaTable); +// editableTable.setColumns(InsuranceArchivesBO.buildCompensationEditTableColumns(employeeId, tenantKey)); +// editableTable.setComProps(InsuranceArchivesBO.buildSupplementEditTableItemMap()); +// editableTable.setShowCheck(false); +// editableTable.setEllipsis(true); +// result.setEditableTable(editableTable); +// InsuranceAccountDetailPO insuranceAccountDetailPO = new LambdaQueryChainWrapper<>(siAccountDetailMapper) +// .eq(InsuranceAccountDetailPO::getId, id) +// .one(); +// SalaryAssert.notNull(insuranceAccountDetailPO, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 139811, "人员不存在")); +// insuranceAccountDetailPO = (InsuranceAccountDetailPO) dataSecurityService.decrypt(insuranceAccountDetailPO, InsuranceAccountDetailPO.class, tenantKey); +// Map> group = new HashMap<>(); +// //组装社保数据 +// Set socialInsuranceIds = new HashSet<>(); +// String socialPerJson = insuranceAccountDetailPO.getSocialPerJson(); +// HashMap socialPerMap = new HashMap<>(); +// if (StringUtils.isNotBlank(socialPerJson)) { +// socialPerMap = JSON.parseObject(socialPerJson, new HashMap().getClass()); +// socialPerMap.forEach((k, v) -> socialInsuranceIds.add(k)); +// } +// String socialComJson = insuranceAccountDetailPO.getSocialComJson(); +// HashMap socialComMap = new HashMap<>(); +// if (StringUtils.isNotBlank(socialComJson)) { +// socialComMap = JSON.parseObject(socialComJson, new HashMap().getClass()); +// socialComMap.forEach((k, v) -> socialInsuranceIds.add(k)); +// } +// List socialSupplementList = new ArrayList<>(); +// for (String insuranceId : socialInsuranceIds) { +// InsuranceSupplementListDTO dto = new InsuranceSupplementListDTO(); +// dto.setItem(siCategoryService.getCategoryNameById(Long.valueOf(insuranceId), tenantKey)); +// dto.setPaymentPer(socialPerMap.get(insuranceId)); +// dto.setPaymentCom(socialComMap.get(insuranceId)); +// dto.setId(insuranceId); +// socialSupplementList.add(dto); +// } +// group.put("social", socialSupplementList); +// +// //组装公积金数据 +// Set fundInsuranceIds = new HashSet<>(); +// String fundPerJson = insuranceAccountDetailPO.getFundPerJson(); +// HashMap fundperMap = new HashMap<>(); +// if (StringUtils.isNotBlank(fundPerJson)) { +// fundperMap = JSON.parseObject(fundPerJson, new HashMap().getClass()); +// fundperMap.forEach((k, v) -> fundInsuranceIds.add(k)); +// } +// String fundComJson = insuranceAccountDetailPO.getFundComJson(); +// HashMap fundComMap = new HashMap<>(); +// if (StringUtils.isNotBlank(fundComJson)) { +// fundComMap = JSON.parseObject(fundComJson, new HashMap().getClass()); +// fundComMap.forEach((k, v) -> fundInsuranceIds.add(k)); +// } +// List fundSupplementList = new ArrayList<>(); +// for (String insuranceId : fundInsuranceIds) { +// InsuranceSupplementListDTO dto = new InsuranceSupplementListDTO(); +// dto.setItem(siCategoryService.getCategoryNameById(Long.valueOf(insuranceId), tenantKey)); +// dto.setPaymentPer(fundperMap.get(insuranceId)); +// dto.setPaymentCom(fundComMap.get(insuranceId)); +// dto.setId(insuranceId); +// fundSupplementList.add(dto); +// } +// group.put("fund", fundSupplementList); +// +// //组装其他福利数据 +// Set otherInsuranceIds = new HashSet<>(); +// String otherPerJson = insuranceAccountDetailPO.getOtherPerJson(); +// HashMap otherPerMap = new HashMap<>(); +// if (StringUtils.isNotBlank(otherPerJson)) { +// otherPerMap = JSON.parseObject(otherPerJson, new HashMap().getClass()); +// otherPerMap.forEach((k, v) -> otherInsuranceIds.add(k)); +// } +// String otherComJson = insuranceAccountDetailPO.getOtherComJson(); +// HashMap otherComMap = new HashMap<>(); +// if (StringUtils.isNotBlank(otherComJson)) { +// otherComMap = JSON.parseObject(otherComJson, new HashMap().getClass()); +// otherComMap.forEach((k, v) -> otherInsuranceIds.add(k)); +// } +// List otherSupplementList = new ArrayList<>(); +// for (String insuranceId : otherInsuranceIds) { +// InsuranceSupplementListDTO dto = new InsuranceSupplementListDTO(); +// dto.setItem(siCategoryService.getCategoryNameById(Long.valueOf(insuranceId), tenantKey)); +// dto.setPaymentPer(otherPerMap.get(insuranceId)); +// dto.setPaymentCom(otherComMap.get(insuranceId)); +// dto.setId(insuranceId); +// otherSupplementList.add(dto); +// } +// group.put("other", otherSupplementList); +// Map> items = new HashMap<>(); +// Map socialItem = new HashMap<>(); +// socialItem.put("index", "0"); +// socialItem.put("groupName", SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86568, "社保")); +// items.put("social", socialItem); +// Map fundItem = new HashMap<>(); +// fundItem.put("index", "1"); +// fundItem.put("groupName", SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86569, "公积金")); +// items.put("fund", fundItem); +// Map otherItem = new HashMap<>(); +// otherItem.put("index", "2"); +// otherItem.put("groupName", SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 93112, "企业年金及其他福利")); +// items.put("other", otherItem); +// result.setItems(items); +// result.setGroup(group); +// return result; +// } }