Merge branch 'feature/gongfu' into feature/quotation

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;
 }

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;
 }

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;
 }

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}
         </if>
+        <if test="query.key!=null and query.key!=''">
+            and concat(a.customer_name,a.device_no) LIKE concat('%', #{query.key}, '%')
+        </if>
     </sql>
 
     <select id="getList" resultType="com.nflg.mobilebroken.repository.entity.Device">

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

@@ -31,6 +31,9 @@
             and a.start_warranty_date >= #{query.warrantyStartDate} and start_warranty_date <=
             #{query.warrantyEndDate}
         </if>
+        <if test="query.key!=null and query.key!=''">
+            and concat(a.customer_name,a.device_no) LIKE concat('%', #{query.key}, '%')
+        </if>
     </sql>
 
     <select id="getList" resultType="com.nflg.mobilebroken.repository.entity.GongfuDevice">

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

@@ -74,6 +74,9 @@
             <if test="request.title!=null and request.title!=''">
                 AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%'))
             </if>
+            <if test="request.no!=null and request.no!=''">
+                AND (t.title LIKE CONCAT('%', #{request.no}, '%') OR t.no LIKE CONCAT('%', #{request.no}, '%'))
+            </if>
             <if test="request.deviceNo!=null and request.deviceNo!=''">
                 AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%')
             </if>

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

@@ -77,6 +77,9 @@
             <if test="request.title!=null and request.title!=''">
                 AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%'))
             </if>
+            <if test="request.no!=null and request.no!=''">
+                AND (t.title LIKE CONCAT('%', #{request.no}, '%') OR t.no LIKE CONCAT('%', #{request.no}, '%'))
+            </if>
             <if test="request.deviceNo!=null and request.deviceNo!=''">
                 AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%')
             </if>