From 21a6c4984300992d7d38660278208be6eafa098b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 20 Nov 2023 10:58:17 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-20=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java  | 13 ++++++++
 .../sys/modules/pms/mapper/QcMapper.java      |  2 ++
 .../pms/service/Impl/QcServiceImpl.java       | 13 ++++++++
 .../sys/modules/pms/service/QcService.java    |  2 ++
 src/main/resources/mapper/pms/QcMapper.xml    | 31 ++++++++++++++++++-
 5 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
index 0c5d0079..14a95eae 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
@@ -440,6 +440,19 @@ public class QcController {
         return R.ok().put("row1", row1).put("row2", row2);
     }
 
+    /**
+     * @description: 查询项目
+     * @author: fengyuan_yang
+     * @date: 2023/11/19 13:03
+     * @param: [data]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping("/getItem")
+    public R getItem(@RequestBody QcTemplateData data){
+        List<QcTemplateData> rows = qcService.getItem(data);
+        return R.ok().put("rows", rows);
+    }
+
     /**
      * @description: 删除模板的检验项目
      * @author: fengyuan_yang
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 9f62e8c6..2036bd55 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -438,4 +438,6 @@ public interface QcMapper {
     void saveIPQCRecordCount(QcFAIRecordData data);
 
     void deleteIPQCRecordCount(QcFAIRecordData qcData);
+
+    List<QcTemplateData> getItem(QcTemplateData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 385996d2..7994863d 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -568,6 +568,19 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * @description: 查询项目
+     * @author: fengyuan_yang
+     * @date: 2023/11/19 13:04
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     **/
+    @Override
+    public List<QcTemplateData> getItem(QcTemplateData data) {
+        List<QcTemplateData> list = qcMapper.getItem(data);
+        return list;
+    }
+
     /**
      * @description: 删除项目
      * @author: fengyuan_yang
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
index c8313f7c..d6ac8753 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
@@ -261,4 +261,6 @@ public interface QcService {
     List<QcFAIRecordData> umSearch(QcFAIRecordData data);
 
     void subDetailUpload(MultipartFile file, GetParamInData data);
+
+    List<QcTemplateData> getItem(QcTemplateData data);
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index b3a8f4f8..ead64744 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -485,12 +485,41 @@
         SELECT
             a.site,
             a.itemNo,
-            a.ItemDesc
+            a.ItemDesc,
+            a.DefaultValue,
+            a.MaxValue,
+            a.MinValue
         FROM  eam_properties_item a
         LEFT JOIN qc_template_detailed b ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo and a.site = b.site
         WHERE a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null
     </select>
 
+    <!-- 查询项目 -->
+    <select id="getItem" resultType="QcTemplateData">
+        SELECT
+            a.site,
+            a.itemNo,
+            a.ItemDesc,
+            a.DefaultValue,
+            a.MaxValue,
+            a.MinValue
+        FROM  eam_properties_item a
+        LEFT JOIN qc_template_detailed b ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo and a.site = b.site
+        <where>
+            a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null
+            <if test = "itemNo != null and itemNo != ''">
+                AND a.ItemNo LIKE '%' + #{itemNo} + '%'
+            </if>
+            <if test = "itemDesc != null and itemDesc != ''">
+                AND a.ItemDesc LIKE '%' + #{itemDesc} + '%'
+            </if>
+            <if test = "inspectionTypeNo != null and inspectionTypeNo != ''">
+                AND a.inspection_type_no = #{inspectionTypeNo}
+            </if>
+        </where>
+    </select>
+
+
     <!-- 删除模板 -->
     <delete id="templateDelete" parameterType="QcTemplateData">
         DELETE FROM qc_template