Merge branch 'feature/bug-612' into test

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java

@@ -35,4 +35,9 @@ public class AdminTicketSearchRequest extends TicketSearchRequest {
 
     //代理商编码
     private String agentCode;
+
+    /**
+     * 搜索关键字，同时搜索标题、设备编号、设备机型、问题描述、问题部位
+     */
+    private String key;
 }

nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml

@@ -80,6 +80,14 @@
             <if test="request.createUserName!=null and request.createUserName!=''">
                 AND d.customer_name LIKE CONCAT('%', #{request.createUserName}, '%')
             </if>
+            <if test="request.key!=null and request.key!=''">
+                AND (t.title LIKE CONCAT('%', #{request.key}, '%')
+                    or t.device_no LIKE CONCAT('%', #{request.key}, '%')
+                    or d.model_no LIKE CONCAT('%', #{request.key}, '%')
+                    or t.description LIKE CONCAT('%', #{request.key},'%')
+                    or p.part_name LIKE CONCAT('%', #{request.key}, '%')
+                )
+            </if>
         </where>
     </sql>