欧姆龙解析请假多层级
This commit is contained in:
parent
a33a9a3a24
commit
00ecc61aa2
|
|
@ -60,14 +60,26 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
|
|||
if (dataIndex.equals("leave") && column.get("children") != null) {
|
||||
List<Map> list = (List<Map>) column.get("children");
|
||||
if (CollectionUtils.isNotEmpty(list)) {
|
||||
list.stream()
|
||||
.filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
|
||||
.forEach(leave -> {
|
||||
Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
|
||||
map.put("code", leave.get("dataIndex").toString());
|
||||
map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")");
|
||||
columns.add(map);
|
||||
});
|
||||
// list.stream()
|
||||
// .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
|
||||
// .forEach(leave -> {
|
||||
// Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
|
||||
// map.put("code", leave.get("dataIndex").toString());
|
||||
// map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")");
|
||||
// columns.add(map);
|
||||
// });
|
||||
for (Map list2:list) {
|
||||
List<Map> children2 = (List<Map>) list2.get("children");
|
||||
children2.stream()
|
||||
.filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
|
||||
.forEach(leave -> {
|
||||
Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
|
||||
map.put("code", leave.get("dataIndex").toString());
|
||||
map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")");
|
||||
columns.add(map);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
//出勤班次
|
||||
|
|
|
|||
Loading…
Reference in New Issue