From 88d9cdd0323aa9500646145788bc7fd36775d6e7 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 11 Dec 2023 10:37:28 +0800
Subject: [PATCH] =?UTF-8?q?2023-12-11=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/EamMapper.xml | 5 ++++-
 src/main/resources/mapper/pms/QcMapper.xml  | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 285d535b..447fc9e1 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -713,9 +713,12 @@
             <if test='query.functionType == "B" and query.searchType == "reportMaintenance" '>
                 AND (a.status = '未开工' or a.status = '已到达')
             </if>
-            <if test='query.functionType == "C" and query.searchType == "reportDefect" '>
+            <if test='(query.status == null || query.status == "") and query.functionType == "C" and query.searchType == "reportDefect" '>
                 AND (a.status = '未开工' or a.status = '已到达')
             </if>
+            <if test='query.status != null and query.status != "" and query.functionType == "C" and query.searchType == "reportDefect" '>
+                AND a.status = #{query.status}
+            </if>
             <if test="query.planDate != null">
                 AND a.PlanDate = #{query.planDate}
             </if>
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 81b3ee3a..a28c31e1 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -2118,6 +2118,15 @@
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND part_desc LIKE '%' + #{query.partDesc} + '%'
             </if>
+            <if test = "query.supplierDesc != null and query.supplierDesc != ''">
+                AND dbo.qc_get_supplier_name(site, supplier_no) LIKE '%' + #{query.supplierDesc} + '%'
+            </if>
+            <if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
+                AND disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
+            </if>
+            <if test = "query.inspectorName != null and query.inspectorName != ''">
+                AND dbo.qc_get_inspector_name(site, inspector_no) LIKE '%' + #{query.inspectorName} + '%'
+            </if>
             <if test="query.startDate != null">
                 AND inspector_date >= #{query.startDate}
             </if>