feat(qms): 优化检测项详情接口,新增任务状态返回

- 修改 detail 接口返回类型为包含检测项及任务状态的复合对象
- 查询任务状态并包含在返回结果中
- 更新对应服务方法实现,支持同时返回检测项列表和任务状态
- 修改数据库查询,增加任务状态字段检索
- 为任务状态字段添加 VO 层定义及注释说明
- 调整 Mapper XML 和相关 VO 类以支持新增字段展现
This commit is contained in:
funny 2026-05-07 16:55:17 +08:00
parent 867d564319
commit f7dcd03b54
5 changed files with 38 additions and 5 deletions

View File

@ -81,7 +81,7 @@ public class QmsPdiInspectionResultsController extends BaseController {
* 根据任务ID + 检测项类型返回对应检测结果及图片URL
*/
@PostMapping("detail")
public ApiResult<List<QmsPdiTaskRecordDetailVO.StatusItemVO>> detail(
public ApiResult<QmsPdiTaskRecordDetailVO.DetailWithStatusVO> detail(
@Valid @RequestBody QmsPdiTaskRecordStatusItemDetailQO request) {
return ApiResult.success(inspectionResultsControllerService.detail(request));
}

View File

@ -276,10 +276,20 @@ public class QmsPdiInspectionResultsControllerService {
/**
* 查询检测项详情平板使用不分页
* 根据任务ID + 检测项类型返回对应结果及图片URL
* 根据任务ID + 检测项类型返回对应结果及图片URL同时返回任务状态
*/
public List<QmsPdiTaskRecordDetailVO.StatusItemVO> detail(QmsPdiTaskRecordStatusItemDetailQO request) {
return taskRecordControllerService.statusItemList(request.getId(), request.getInspectionItemType());
public QmsPdiTaskRecordDetailVO.DetailWithStatusVO detail(QmsPdiTaskRecordStatusItemDetailQO request) {
QmsPdiTaskRecordDetailVO.DetailWithStatusVO result = new QmsPdiTaskRecordDetailVO.DetailWithStatusVO();
// 查询任务状态
QmsPdiTaskRecord taskRecord = taskRecordService.getById(request.getId());
if (taskRecord != null) {
result.setInspectionEnable(taskRecord.getInspectionEnable());
}
// 查询检测项列表
result.setItems(taskRecordControllerService.statusItemList(request.getId(), request.getInspectionItemType()));
return result;
}
// ========================= 任务概要 =========================

View File

@ -49,4 +49,9 @@ public class QmsPdiInspectionResultsPageVO {
* 要求完成时间
*/
private LocalDateTime requiredCompletionTime;
/**
* 质检状态0=待检查1=检验中2=已完成
*/
private Integer inspectionEnable;
}

View File

@ -132,4 +132,21 @@ public class QmsPdiTaskRecordDetailVO {
*/
private List<String> inspectionItemImage;
}
/**
* 检测项详情含任务状态
*/
@Data
public static class DetailWithStatusVO {
/**
* 质检状态0=待检查1=检验中2=已完成
*/
private Integer inspectionEnable;
/**
* 检测项列表
*/
private List<StatusItemVO> items;
}
}

View File

@ -46,7 +46,8 @@
t.task_no AS taskNo,
r.inspection_version AS inspectionVersion,
t.submission_time AS submissionTime,
t.required_completion_time AS requiredCompletionTime
t.required_completion_time AS requiredCompletionTime,
t.inspection_enable AS inspectionEnable
FROM qms_pdi_task_record t
LEFT JOIN qms_pdi_detection_rules r ON r.id = t.detection_rules_id
<where>