From 39a2b2ca5433060b1da20e71d86badeaf1a436ce Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 18 Sep 2024 14:13:38 +0800
Subject: [PATCH] =?UTF-8?q?9/18=20=E6=8B=86=E9=9B=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/inout/IoSplitCodeRequest.java  | 3 +++
 .../resources/mybatis/mapper/inout/IoSplitCodeMapper.xml | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
index c39102832..e4955a379 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
@@ -139,6 +139,9 @@ public class IoSplitCodeRequest extends ListPageRequest {
      */
     private String keywords;
 
+    private String startTime;
+    private String endTime;
+    private String productName;
 
 
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
index 425e9c5a8..e5e0775a9 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
@@ -39,13 +39,22 @@
             <if test=" workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
+            <if test=" productName != null and productName != ''">
+                AND bp.cpmctymc = #{productName}
+            </if>
             <if test="keywords != null and keywords != ''">
                 and (isc.workPlaceCode like concat('%', #{keywords}, '%')
                 or isc.nameCode like concat('%', #{keywords}, '%')
                 or isc.batchNo like concat('%', #{keywords}, '%')
                 or isc.supId like concat('%', #{keywords}, '%')
+                or bp.cpmctymc like concat('%', #{keywords}, '%')
+                or bp.bzgg like concat('%', #{keywords}, '%')
+                or bp.ggxh like concat('%', #{keywords}, '%')
                 or isc.invCode like concat('%', #{keywords}, '%'))
             </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(isc.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
         </where>
     </select>
 </mapper>