feat(inspection): 优化检验任务PDF图纸相关数据结构和查询
- 新增PdfDrawingVO,封装检测项ID与PDF地址映射关系 - 修改QmsIncomingInspectionTaskCheckDetailVO中的pdfDrawings类型为PdfDrawingVO列表 - QmsIncomingInspectionTaskCheckItemVO新增PDF页码及定位尺寸字段支持 - 查询语句getItemsForCheck扩展,增加PDF坐标及尺寸字段查询 - 调整IncomingInspectionTaskControllerService中PDF图纸数据获取逻辑,映射为PdfDrawingVO列表
This commit is contained in:
parent
59bbb396c3
commit
acf65034ee
|
|
@ -762,11 +762,11 @@ public class IncomingInspectionTaskControllerService {
|
||||||
.setCount(Math.min(task.getDetectionQty() - count, request.getNum()))
|
.setCount(Math.min(task.getDetectionQty() - count, request.getNum()))
|
||||||
.setPdfDrawings(
|
.setPdfDrawings(
|
||||||
inspectionStandardItemService.lambdaQuery()
|
inspectionStandardItemService.lambdaQuery()
|
||||||
.select(QmsInspectionStandardItem::getPdfDrawing)
|
.select(QmsInspectionStandardItem::getId, QmsInspectionStandardItem::getPdfDrawing)
|
||||||
.eq(QmsInspectionStandardItem::getInspectionStandardId, standard.getId())
|
.eq(QmsInspectionStandardItem::getInspectionStandardId, standard.getId())
|
||||||
.list()
|
.list()
|
||||||
.stream()
|
.stream()
|
||||||
.map(QmsInspectionStandardItem::getPdfDrawing)
|
.map(it -> new PdfDrawingVO(it.getId(), it.getPdfDrawing()))
|
||||||
.toList()
|
.toList()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
package com.nflg.wms.common.pojo.vo;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PdfDrawingVO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检测项ID
|
||||||
|
*/
|
||||||
|
private Long itemId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* pdf地址
|
||||||
|
*/
|
||||||
|
private String pdfUrl;
|
||||||
|
}
|
||||||
|
|
@ -12,7 +12,7 @@ public class QmsIncomingInspectionTaskCheckDetailVO {
|
||||||
/**
|
/**
|
||||||
* pdf图纸列表
|
* pdf图纸列表
|
||||||
*/
|
*/
|
||||||
private List<String> pdfDrawings;
|
private List<PdfDrawingVO> pdfDrawings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 样本数量
|
* 样本数量
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,11 @@ import lombok.Data;
|
||||||
@Data
|
@Data
|
||||||
public class QmsIncomingInspectionTaskCheckItemVO {
|
public class QmsIncomingInspectionTaskCheckItemVO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查项ID
|
||||||
|
*/
|
||||||
|
private Long itemId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查项内容ID
|
* 检查项内容ID
|
||||||
*/
|
*/
|
||||||
|
|
@ -34,4 +39,29 @@ public class QmsIncomingInspectionTaskCheckItemVO {
|
||||||
* 判定类型,0:直接判定;1:测量值
|
* 判定类型,0:直接判定;1:测量值
|
||||||
*/
|
*/
|
||||||
private Integer judgmentType;
|
private Integer judgmentType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PDF页码
|
||||||
|
*/
|
||||||
|
private Integer pdfPageNum;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PDF x轴起始位置
|
||||||
|
*/
|
||||||
|
private Float pdfX;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PDF y轴起始位置
|
||||||
|
*/
|
||||||
|
private Float pdfY;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PDF宽度
|
||||||
|
*/
|
||||||
|
private Float pdfWidth;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PDF高度
|
||||||
|
*/
|
||||||
|
private Float pdfHeight;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,18 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getItemsForCheck" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO">
|
<select id="getItemsForCheck" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO">
|
||||||
SELECT qisic.id as "itemContentId",qisi.item_type,CASE WHEN qisi.item_type=0 THEN qisi.name ELSE qisic.name END as "name",qisic.test_standard,qisic.legend,qisic.judgment_type
|
SELECT qisi.id as "itemId"
|
||||||
|
, qisic.id as "itemContentId"
|
||||||
|
, qisi.item_type
|
||||||
|
, CASE WHEN qisi.item_type = 0 THEN qisi.name ELSE qisic.name END as "name"
|
||||||
|
, qisic.test_standard
|
||||||
|
, qisic.legend
|
||||||
|
, qisic.judgment_type
|
||||||
|
, qisic.pdf_page_num
|
||||||
|
, qisic.pdf_x
|
||||||
|
, qisic.pdf_y
|
||||||
|
, qisic.pdf_width
|
||||||
|
, qisic.pdf_height
|
||||||
FROM qms_inspection_standard_item qisi
|
FROM qms_inspection_standard_item qisi
|
||||||
INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id" = qisic.inspection_standard_item_id
|
INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id" = qisic.inspection_standard_item_id
|
||||||
WHERE qisi.inspection_standard_id = #{id}
|
WHERE qisi.inspection_standard_id = #{id}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue