From f5aa9863cfce31b7c6b1294aee4769057bb535a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 2 Jun 2024 20:08:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E4=BA=BA=E5=91=98=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=9B=E5=A2=9E=E5=8A=A0=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/query/BomNewEbomParentQuery.java       |  6 ++++++
 .../resources/mapper/master/BomNewEbomParentMapper.xml | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
index a085a7e9..b3204220 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
@@ -52,5 +52,11 @@ public class BomNewEbomParentQuery  extends BasePageQuery implements Serializabl
     @ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为0")
     private Integer showMySelfOnly = 0;
 
+    /**
+     * 通知单号
+     */
+    @ApiModelProperty(value = "通知单号")
+    private String noticeNo;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 133571f7..178ee084 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -75,7 +75,10 @@
             and material_no=#{query.materialNo}
         </if>
         <if test="query.deviseName!=null and query.deviseName!=''">
-            and devise_name=#{query.deviseName}
+            and devise_name LIKE concat('%', #{query.deviseName}, '%')
+        </if>
+        <if test="query.noticeNo!=null and query.noticeNo!=''">
+            AND notice_nums LIKE concat('%', #{query.noticeNo}, '%')
         </if>
         <if test="query.startDate!=null and query.startDate!=''">
             and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
@@ -419,11 +422,14 @@
                 root_is_for_wait_review=1) AND created_by=#{userCode})
             </if>
             <if test="query.deviseName!=null and query.deviseName!=''">
-                AND devise_name=#{query.deviseName}
+                AND devise_name LIKE concat('%', #{query.deviseName}, '%')
             </if>
             <if test="query.startDate!=null and query.startDate!=''">
                 AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
             </if>
+            <if test="query.noticeNo!=null and query.noticeNo!=''">
+                AND notice_nums LIKE concat('%', #{query.noticeNo}, '%')
+            </if>
         </where>
         order by row_id desc
     </select>