From 3306afced9292f6d2bc2a3bc97b21d213677fb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 29 Jul 2025 11:05:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-528=20app=E7=AB=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobilebroken/common/pojo/request/SearchDeviceRequest.java  | 3 +++
 .../src/main/resources/mapper/DeviceMapper.xml                 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
index 17b0eb23..86b5b9f3 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
@@ -15,6 +15,9 @@ public class SearchDeviceRequest extends PageRequest {
     // 设备型号
     private String modelNo;
 
+    // 设备编号或设备型号
+    private String key;
+
     //开始时间
     private LocalDate startTime;
 
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
index 98b4d7b8..ad4d57c2 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
@@ -86,6 +86,9 @@
         <if test="request.endTime!=null and request.endTime!=''">
             and d.shipment_date &lt;= #{request.endTime}
         </if>
+        <if test="request.key!=null and request.key!=''">
+            and (d.device_no LIKE concat('%', #{request.key}, '%') or d.model_no LIKE concat('%', #{request.key}, '%'))
+        </if>
     </select>
     <!--定时任务-质保未开始-->
     <update id="taskWarrantyStateNotStarted">