|
@@ -1563,6 +1563,9 @@ public class BizDayworkController extends BaseController {
|
|
departments = deptService.selectDeptListByPlanDetailsId(dept);
|
|
departments = deptService.selectDeptListByPlanDetailsId(dept);
|
|
}
|
|
}
|
|
List<BizWorkshop> finalWorkShopList = workShopList;
|
|
List<BizWorkshop> finalWorkShopList = workShopList;
|
|
|
|
+ depts.forEach(l -> {
|
|
|
|
+ l.setTurnovers(bizTurnovers.stream().filter(v -> v.getDeptId().equals(l.getDeptId())).collect(Collectors.toList()));
|
|
|
|
+ });
|
|
departments.forEach(l -> {
|
|
departments.forEach(l -> {
|
|
BizWorkshop bizWorkshop = finalWorkShopList.stream().filter(v -> v.getId().equals(l.getWorkshopId())).findFirst().orElse(null);
|
|
BizWorkshop bizWorkshop = finalWorkShopList.stream().filter(v -> v.getId().equals(l.getWorkshopId())).findFirst().orElse(null);
|
|
l.setWorkshopName(bizWorkshop == null ? null : bizWorkshop.getName());
|
|
l.setWorkshopName(bizWorkshop == null ? null : bizWorkshop.getName());
|