From 15b676dbef4fe1b6a30df889adbae7689ff412ef Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 16:04:36 +0800
Subject: [PATCH] =?UTF-8?q?10/15=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/FilterOrderDetailResultRequest.java |  7 ++++++
 .../mapper/inout/IoOrderDetailResultDao.xml   | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
index ba50fc9c..78405e27 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -58,4 +58,11 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private List<IoOrderDetailResultResponse> list;
 
     private Integer productType = 1;//默认耗材
+
+    private String keyWords;
+    private String cpmctymc;
+    private String ggxh;
+    private String prepnSpec;
+
+
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index e300fbee..6e99364f 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -84,6 +84,17 @@
             </if>
             <if test="batchNo != null and batchNo != ''">
                 AND a2.batchNo like concat('%', #{batchNo}, '%')
+            </if>ggxh
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND (
+                bp.ggxh LIKE concat('%', #{ggxh}, '%')
+                or  bp.bzgg  LIKE concat('%', #{ggxh}, '%'))
+            </if>
+            <if test="prepnSpec != null and prepnSpec != ''">
+                AND bp.prepnSpec LIKE concat('%', #{prepnSpec}, '%')
             </if>
             <if test="coName != null and coName != ''">
                 AND a2.coName like concat('%', #{coName}, '%')
@@ -97,6 +108,18 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                a2.nameCode LIKE concat('%', #{keyWords}, '%')
+                or a2.orderIdFk  LIKE concat('%', #{keyWords}, '%')
+                or bp.bzgg LIKE concat('%', #{keyWords}, '%')
+                or bp.prepnSpec LIKE concat('%', #{keyWords}, '%')
+                or bp.cpmctymc LIKE concat('%', #{keyWords}, '%')
+                or bp.ggxh LIKE concat('%', #{keyWords}, '%')
+                or a2.batchNo like concat('%', #{keyWords}, '%')
+                or a2.certCode like concat('%', #{keyWords}, '%')
+                or a2.manufacturer like concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         group by a2.id
     </select>