|
@@ -99,6 +99,10 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getList(bizDayworkAuxiliaryItem);
|
|
List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getList(bizDayworkAuxiliaryItem);
|
|
|
|
+ List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizDayworkAuxiliaryItem::getDayworkId).collect(Collectors.toList())).list();
|
|
|
|
+ list.forEach(e -> {
|
|
|
|
+ e.setDaywork(bizDayworks.stream().filter(v -> v.getId().equals(e.getDayworkId())).findFirst().orElse(null));
|
|
|
|
+ });
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|