|
@@ -422,7 +422,7 @@ public class BizLotController extends BaseController {
|
|
|
// 当前工段
|
|
|
BizDaywork bizDaywork = bizDayworkService.query().eq("lot_id", bizLot.getId()).one();
|
|
|
BizDayworkItem conditions = new BizDayworkItem();
|
|
|
- conditions.setLotId(lot.getId());
|
|
|
+ conditions.setDayworkId(bizDaywork.getId());
|
|
|
List<BizDayworkItem> dayworkItemList = bizDayworkItemService.getList(conditions);
|
|
|
BizDayworkItem dayworkItem = dayworkItemList.stream().sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).thenComparing(BizDayworkItem::getStatus).reversed()).collect(Collectors.toList()).stream().findFirst().orElse(new BizDayworkItem());
|
|
|
SysDept dept = deptMapper.selectDeptById(dayworkItem.getDeptId());
|