2023-12-11 设备和质量提交

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>

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>