|
|
|
|
@ -264,7 +264,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
wp.setCheckItemList(workPlanItemService.listByWorkPlanId(oldWp.getId())); |
|
|
|
|
wp.setInspectionTask(inspectionTaskMapper.getPrWorkCheckByWpId(oldWp.getId())); |
|
|
|
|
wp.setInspectionTask(inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, oldWp.getId()))); |
|
|
|
|
wpList.add(wp); |
|
|
|
|
} |
|
|
|
|
return wpList; |
|
|
|
|
@ -1612,7 +1612,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
// 保存检验任务
|
|
|
|
|
InspectionTask inspectionTask = new InspectionTask(); |
|
|
|
|
inspectionTask.setWpId(workPlan.getId()); |
|
|
|
|
inspectionTaskService.saveOrEdit(inspectionTask, userId); |
|
|
|
|
inspectionTask.setCheckUserId(userId); |
|
|
|
|
inspectionTask.setCheckDate(LocalDateTime.now()); |
|
|
|
|
inspectionTaskMapper.insertOrUpdate(inspectionTask); |
|
|
|
|
|
|
|
|
|
// 保存检验项目
|
|
|
|
|
List<WorkPlanItem> workPlanItems = new ArrayList<>(); |
|
|
|
|
|