diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java index 5b54f80d..36da7a35 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java @@ -96,12 +96,12 @@ public class QmsInspectionItemController extends BaseController { } /** - * 按检测项ID查明细列表(不分页) + * 按检测项ID查询详情(包含主表信息和明细列表) * * @param id 检测项ID */ @GetMapping("details") - public ApiResult> details(@NotNull(message = "ID不能为空") Long id) { + public ApiResult details(@NotNull(message = "ID不能为空") Long id) { return ApiResult.success(inspectionItemService.getDetails(id)); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java index 77e9fb85..7a435727 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java @@ -39,9 +39,9 @@ public interface IQmsInspectionItemService extends IService { PageData search(QmsInspectionItemSearchQO qo); /** - * 按检测项ID查询明细列表 + * 按检测项ID查询详情(包含主表信息和明细列表) */ - List getDetails(Long id); + QmsInspectionItemVO getDetails(Long id); /** * 查询导出数据 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java index fba7e810..cf02ccec 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java @@ -185,13 +185,28 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl getDetails(Long id) { - return detailsService.lambdaQuery() + public QmsInspectionItemVO getDetails(Long id) { + // 查询主表信息 + QmsInspectionItem item = getById(id); + if (Objects.isNull(item)) { + throw new NflgException(STATE.BusinessError, "检测项不存在"); + } + + // 转换为主表VO + QmsInspectionItemVO vo = toVO(item); + + // 查询明细列表 + List detailsList = detailsService.lambdaQuery() .eq(QmsInspectionItemDetails::getInspectionItemId, id) .list() .stream() .map(this::toDetailsVO) .collect(Collectors.toList()); + + // 设置明细列表 + vo.setDetails(detailsList); + + return vo; } // ==================== 导出 ====================