From 7665a350b6b997994686eec07236b6991758f845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 21 Jan 2026 16:56:16 +0800 Subject: [PATCH] =?UTF-8?q?hotfix=20=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java | 5 +++++ .../common/pojo/request/AdminTicketSearchRequest.java | 3 +++ .../com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java | 5 +++++ .../src/main/resources/mapper/DeviceMapper.xml | 3 +++ .../src/main/resources/mapper/GongfuDeviceMapper.xml | 3 +++ .../src/main/resources/mapper/GongfuTicketMapper.xml | 3 +++ .../src/main/resources/mapper/TicketMapper.xml | 3 +++ 7 files changed, 25 insertions(+) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java index 5a92d3ff..487a821d 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java @@ -39,4 +39,9 @@ public class DeviceQuery extends PageBaseQuery { * 质保结束日期（区间查询） */ private String warrantyEndDate; + + /** + * 搜索设备编号和机型 + */ + private String key; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java index b103b7f2..e5cd053d 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java @@ -40,4 +40,7 @@ public class AdminTicketSearchRequest extends TicketSearchRequest { * 搜索关键字，同时搜索标题、设备编号、设备机型、问题描述、问题部位 */ private String key; + + //工单编号或者标题 + private String no; } \ No newline at end of file diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java index 09118587..37020c79 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java @@ -39,4 +39,9 @@ public class DeviceQuery extends PageBaseQuery { * 质保结束日期（区间查询） */ private String warrantyEndDate; + + /** + * 搜索设备编号和机型 + */ + private String key; } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index 0d236cbf..ae46e199 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -42,6 +42,9 @@ and a.start_warranty_date >= #{query.warrantyStartDate} and start_warranty_date <= #{query.warrantyEndDate} + + and concat(a.customer_name,a.device_no) LIKE concat('%', #{query.key}, '%') + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/GongfuTicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/GongfuTicketMapper.xml index 567649c3..559212a1 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/GongfuTicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/GongfuTicketMapper.xml @@ -74,6 +74,9 @@ AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%')) + + AND (t.title LIKE CONCAT('%', #{request.no}, '%') OR t.no LIKE CONCAT('%', #{request.no}, '%')) + AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%') diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index e39b9f25..291f73f8 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -77,6 +77,9 @@ AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%')) + + AND (t.title LIKE CONCAT('%', #{request.no}, '%') OR t.no LIKE CONCAT('%', #{request.no}, '%')) + AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%')