工序详情接口优化

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorPlanItemVO.java

@@ -2,9 +2,10 @@ package org.springblade.desk.produce.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
 
 import java.time.LocalDateTime;
-import java.util.Date;
+import java.util.List;
 
 /**
  * 检验项目 视图实体类
@@ -45,4 +46,7 @@ public class ProduceMonitorPlanItemVO {
 	@Schema(description = "检验时间")
 	private LocalDateTime checkDate;
 
+	@Schema(description = "检验详情")
+	private List<WorkPlanItemDetail> itemDetailList;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -48,14 +48,8 @@ import org.springblade.desk.produce.pojo.enums.WorkOrderEnum;
 import org.springblade.desk.produce.pojo.enums.ProcessCycleEnum;
 import org.springblade.desk.produce.pojo.vo.*;
 import org.springblade.desk.produce.service.*;
-import org.springblade.desk.quality.pojo.entity.InspectionTask;
+import org.springblade.desk.quality.pojo.entity.*;
-import org.springblade.desk.quality.pojo.entity.PlanTest;
+import org.springblade.desk.quality.service.*;
-import org.springblade.desk.quality.pojo.entity.ProReTemplate;
-import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
-import org.springblade.desk.quality.service.IInspectionTaskService;
-import org.springblade.desk.quality.service.IPlanTestService;
-import org.springblade.desk.quality.service.IProReTemplateService;
-import org.springblade.desk.quality.service.IWorkPlanItemService;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.erpdata.feign.IErpDataProduceClient;
 import org.springblade.system.cache.DictCache;
@@ -98,6 +92,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IWorkPlanItemService workPlanItemService;
 
+    private final IWorkPlanItemDetailService workPlanItemDetailService;
+
     private final IInspectionTaskService iInspectionTaskService;
 
     private final IWorkOrderRunService workOrderRunService;
@@ -1320,11 +1316,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         // 检验项目
         List<WorkPlanItem> workPlanItems = workPlanItemService.list(Wrappers.lambdaQuery(WorkPlanItem.class).eq(WorkPlanItem::getWpId, wpId));
         if (CollectionUtils.isNotEmpty(workPlanItems)) {
+            List<WorkPlanItemDetail> itemDetails = workPlanItemDetailService.list(Wrappers.lambdaQuery(WorkPlanItemDetail.class).in(WorkPlanItemDetail::getWorkPlanItemId, workPlanItems.stream().map(WorkPlanItem::getId).toList()));
             List<ProduceMonitorPlanItemVO> itemVos = new ArrayList<>();
             for (WorkPlanItem workPlanItem : workPlanItems) {
                 ProduceMonitorPlanItemVO itemVO = new ProduceMonitorPlanItemVO();
                 BeanUtils.copyProperties(workPlanItem, itemVO);
                 itemVO.setCheckMan(UserCache.getUser(workPlanItem.getCheckUserId()) != null ? UserCache.getUser(workPlanItem.getCheckUserId()).getRealName() : "");
+                itemVO.setItemDetailList(itemDetails.stream().filter(itemDetail -> itemDetail.getWorkPlanItemId().equals(workPlanItem.getId())).toList());
                 itemVos.add(itemVO);
             }
             planDataVO.setItemList(itemVos);