|
|
@@ -243,7 +243,7 @@ public class BizQuickDayworkController extends BaseController {
|
|
|
// 判断该批次是否已被领取
|
|
|
// 获取该批次最后一条的状态
|
|
|
List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_id", bizDayworkItem.getCarrierId()).eq("is_changed", 0).list();
|
|
|
- List<BizDaywork> bizDayworks = bizDayworkService.query().eq("dept_id", dept.getId()).in("id", bizDayworkCarriers.isEmpty() ? Collections.singletonList("0") : bizDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
|
|
|
+ List<BizDaywork> bizDayworks = bizDayworkService.query().eq("dept_id", dept.getDeptId()).in("id", bizDayworkCarriers.isEmpty() ? Collections.singletonList("0") : bizDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
|
|
|
List<BizDayworkItem> allBizDayworkItem = bizDayworkItemService.query().in("production_plan_detail_id", list.isEmpty() ? Collections.singletonList("0") : list.stream().map(BizProductionPlanDetail::getId).collect(Collectors.toList())).in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList("0") : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).orderByDesc("create_time").list();
|
|
|
// bizDayworks.forEach(l -> l.setDayworkItemList(allBizDayworkItem.stream().filter(v -> v.getDeptId().equals(bizDayworkItem.getDeptId()) && v.getDayworkId().equals(l.getId())).collect(Collectors.toList())));
|
|
|
bizDayworks.forEach(l -> l.setDayworkItemList(allBizDayworkItem.stream().filter(v -> v.getDayworkId().equals(l.getId())).collect(Collectors.toList())));
|
