修改质检项明细查询功能
This commit is contained in:
parent
6a8af1f362
commit
fc325af3b1
|
|
@ -96,12 +96,12 @@ public class QmsInspectionItemController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 按检测项ID查明细列表(不分页)
|
* 按检测项ID查询详情(包含主表信息和明细列表)
|
||||||
*
|
*
|
||||||
* @param id 检测项ID
|
* @param id 检测项ID
|
||||||
*/
|
*/
|
||||||
@GetMapping("details")
|
@GetMapping("details")
|
||||||
public ApiResult<List<QmsInspectionItemDetailsVO>> details(@NotNull(message = "ID不能为空") Long id) {
|
public ApiResult<QmsInspectionItemVO> details(@NotNull(message = "ID不能为空") Long id) {
|
||||||
return ApiResult.success(inspectionItemService.getDetails(id));
|
return ApiResult.success(inspectionItemService.getDetails(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,9 @@ public interface IQmsInspectionItemService extends IService<QmsInspectionItem> {
|
||||||
PageData<QmsInspectionItemVO> search(QmsInspectionItemSearchQO qo);
|
PageData<QmsInspectionItemVO> search(QmsInspectionItemSearchQO qo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 按检测项ID查询明细列表
|
* 按检测项ID查询详情(包含主表信息和明细列表)
|
||||||
*/
|
*/
|
||||||
List<QmsInspectionItemDetailsVO> getDetails(Long id);
|
QmsInspectionItemVO getDetails(Long id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询导出数据
|
* 查询导出数据
|
||||||
|
|
|
||||||
|
|
@ -185,13 +185,28 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
|
||||||
// ==================== 明细查询 ====================
|
// ==================== 明细查询 ====================
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<QmsInspectionItemDetailsVO> getDetails(Long id) {
|
public QmsInspectionItemVO getDetails(Long id) {
|
||||||
return detailsService.lambdaQuery()
|
// 查询主表信息
|
||||||
|
QmsInspectionItem item = getById(id);
|
||||||
|
if (Objects.isNull(item)) {
|
||||||
|
throw new NflgException(STATE.BusinessError, "检测项不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 转换为主表VO
|
||||||
|
QmsInspectionItemVO vo = toVO(item);
|
||||||
|
|
||||||
|
// 查询明细列表
|
||||||
|
List<QmsInspectionItemDetailsVO> detailsList = detailsService.lambdaQuery()
|
||||||
.eq(QmsInspectionItemDetails::getInspectionItemId, id)
|
.eq(QmsInspectionItemDetails::getInspectionItemId, id)
|
||||||
.list()
|
.list()
|
||||||
.stream()
|
.stream()
|
||||||
.map(this::toDetailsVO)
|
.map(this::toDetailsVO)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
// 设置明细列表
|
||||||
|
vo.setDetails(detailsList);
|
||||||
|
|
||||||
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==================== 导出 ====================
|
// ==================== 导出 ====================
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue