Merge remote-tracking branch 'origin/qms/develop' into qms/develop

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java

@@ -762,11 +762,11 @@ public class IncomingInspectionTaskControllerService {
                 .setCount(Math.min(task.getDetectionQty() - count, request.getNum()))
                 .setPdfDrawings(
                         inspectionStandardItemService.lambdaQuery()
-                                .select(QmsInspectionStandardItem::getPdfDrawing)
+                                .select(QmsInspectionStandardItem::getId, QmsInspectionStandardItem::getPdfDrawing)
                                 .eq(QmsInspectionStandardItem::getInspectionStandardId, standard.getId())
                                 .list()
                                 .stream()
-                                .map(QmsInspectionStandardItem::getPdfDrawing)
+                                .map(it -> new PdfDrawingVO(it.getId(), it.getPdfDrawing()))
                                 .toList()
                 );
     }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PdfDrawingVO.java

@@ -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;
+}

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckDetailVO.java

@@ -12,7 +12,7 @@ public class QmsIncomingInspectionTaskCheckDetailVO {
     /**
      * pdf图纸列表
      */
-    private List<String> pdfDrawings;
+    private List<PdfDrawingVO> pdfDrawings;
 
     /**
      * 样本数量

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCheckItemVO.java

@@ -5,6 +5,11 @@ import lombok.Data;
 @Data
 public class QmsIncomingInspectionTaskCheckItemVO {
 
+    /**
+     * 检查项ID
+     */
+    private Long itemId;
+
     /**
      * 检查项内容ID
      */
@@ -34,4 +39,29 @@ public class QmsIncomingInspectionTaskCheckItemVO {
      * 判定类型，0：直接判定；1：测量值
      */
     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;
 }

nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml

@@ -90,9 +90,20 @@
     </select>
 
     <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
-        INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id"=qisic.inspection_standard_item_id
-        WHERE qisi.inspection_standard_id=#{id}
+                 INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id" = qisic.inspection_standard_item_id
+        WHERE qisi.inspection_standard_id = #{id}
     </select>
 </mapper>