|
@@ -402,6 +402,23 @@ public class WorkOverController {
|
|
|
.map((wop)->wop.getPersonName())
|
|
|
.collect(Collectors.joining(","));
|
|
|
wo.setOverPersonNames(overPersonNames);
|
|
|
+
|
|
|
+// String overPersonIds = page2.getResult().stream()
|
|
|
+// .map((wop)->wop.getPersonId())
|
|
|
+// .collect(Collectors.joining(","));
|
|
|
+// wo.setOverPersonIds(overPersonIds);
|
|
|
+
|
|
|
+ List<Map> overPersonList = new ArrayList<>();
|
|
|
+
|
|
|
+ for (int i=0;i<page2.size();i++){
|
|
|
+ WorkOverPerson workOverPerson=page2.get(i);
|
|
|
+
|
|
|
+ Map<Object,String> overPersonMap = new HashMap<>();
|
|
|
+ overPersonMap.put("id",workOverPerson.getPersonId());
|
|
|
+ overPersonMap.put("name",workOverPerson.getPersonName());
|
|
|
+ overPersonList.add(overPersonMap);
|
|
|
+ }
|
|
|
+ wo.setOverPerson(overPersonList);
|
|
|
}
|
|
|
|
|
|
List<WorkOver> dataList = page.getResult();
|