diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 9019e07e5..293d41e80 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2257,8 +2257,40 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { getPaymentGroup(otherComJson, "公司", "其他福利", dataMap, addGroups); Map resultMap = new HashMap<>(); - resultMap.put("data", dataMap); - resultMap.put("items", addGroups); +// resultMap.put("data", dataMap); +// resultMap.put("items", addGroups); + + List> perList = new ArrayList<>(); + List> comList = new ArrayList<>(); + for (SearchConditionGroup group : addGroups) { + + for (SearchConditionItem item : group.getItems()) { + Map map = new HashMap<>(); + + String[] domkey = item.getDomkey(); + String insuranceId = domkey[0].substring(3); + if (group.getTitle().contains("个人")) { + map.put("title", group.getTitle()); + map.put("paymentScope", "个人"); + map.put("insuranceName", item.getLabel()); + map.put("insuranceId", insuranceId); + map.put("insuranceValue", dataMap.get(domkey[0])); + perList.add(map); + } else if (group.getTitle().contains("公司")) { + map.put("title", group.getTitle()); + map.put("paymentScope", "公司"); + map.put("insuranceName", item.getLabel()); + map.put("insuranceId", insuranceId); + map.put("insuranceValue", dataMap.get(domkey[0])); + comList.add(map); + } + } + } + + List> resultList = new ArrayList<>(); + resultList.addAll(perList); + resultList.addAll(comList); + resultMap.put("data", resultList); return resultMap; }