From 0b20729c3f03b3e9d22dbba50f9a484df2be8486 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, 23 Oct 2023 14:22:36 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-23=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=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/pms/controller/QcController.java   | 4 ++--
 .../java/com/xujie/sys/modules/pms/mapper/QcMapper.java  | 2 +-
 .../sys/modules/pms/service/Impl/QcServiceImpl.java      | 4 ++--
 .../com/xujie/sys/modules/pms/service/QcService.java     | 2 +-
 src/main/resources/mapper/pms/QcMapper.xml               | 9 +++++++--
 5 files changed, 13 insertions(+), 8 deletions(-)

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 242776c3..1bf94b0e 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
@@ -1580,8 +1580,8 @@ public class QcController {
      * @return: com.xujie.sys.common.utils.R
      **/
     @PostMapping(value="/disposalMeasuresSearch")
-    public R disposalMeasuresSearch(){
-        List<QcFAIRecordData> list = qcService.disposalMeasuresSearch();
+    public R disposalMeasuresSearch(@RequestBody QcFAIRecordData data){
+        List<QcFAIRecordData> list = qcService.disposalMeasuresSearch(data);
         return R.ok().put("rows", list);
     }
 }
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 f9b4104f..5c681002 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
@@ -416,5 +416,5 @@ public interface QcMapper {
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
 
-    List<QcFAIRecordData> disposalMeasuresSearch();
+    List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData 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 d7ff297f..97845152 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
@@ -3134,8 +3134,8 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
      **/
     @Override
-    public List<QcFAIRecordData> disposalMeasuresSearch() {
-        List<QcFAIRecordData> list = qcMapper.disposalMeasuresSearch();
+    public List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data) {
+        List<QcFAIRecordData> list = qcMapper.disposalMeasuresSearch(data);
         return list;
     }
 
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 38fb925a..39c643d7 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
@@ -244,5 +244,5 @@ public interface QcService {
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
 
-    List<QcFAIRecordData> disposalMeasuresSearch();
+    List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data);
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 5aae1253..b4bd08bd 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -2588,11 +2588,16 @@
     </select>
 
     <!-- 获取处置措施列表 -->
-    <select id="disposalMeasuresSearch" resultType="QcFAIRecordData">
+    <select id="disposalMeasuresSearch" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
         SELECT
             id,
             disposal_measures
-        FROM  qc_disposal_measures
+        FROM qc_disposal_measures
+        <where>
+            <if test = "inspectionTypeNo != '101'">
+                inspection_type != 'IPQC'
+            </if>
+        </where>
     </select>
 
 </mapper>