qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利台账，修改退差数据单条查看返回格式

This commit is contained in:
sy 2022-11-24 10:43:20 +08:00
parent d976ede775
commit dfcd7d88b0
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -2257,8 +2257,40 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
getPaymentGroup(otherComJson, "公司", "其他福利", dataMap, addGroups);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("data", dataMap);
resultMap.put("items", addGroups);
// resultMap.put("data", dataMap);
// resultMap.put("items", addGroups);
List<Map<String, String>> perList = new ArrayList<>();
List<Map<String, String>> comList = new ArrayList<>();
for (SearchConditionGroup group : addGroups) {
for (SearchConditionItem item : group.getItems()) {
Map<String, String> 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<Map<String, String>> resultList = new ArrayList<>();
resultList.addAll(perList);
resultList.addAll(comList);
resultMap.put("data", resultList);
return resultMap;
}