新增关键字查询

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/mobile/GxtMobileOrderController.java

@@ -6,6 +6,7 @@ import com.ygtx.gxt.domain.*;
 import com.ygtx.gxt.service.IGxtOrderScoreService;
 import com.ygtx.gxt.service.IGxtRepairOrderService;
 import com.ygtx.gxt.service.IGxtWorkOrderService;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,12 +34,12 @@ public class GxtMobileOrderController extends BaseController
      * 查询工单列表（合并维修工单和维保工单）
      */
     @GetMapping("/list")
-    public TableDataInfo list(GxtRepairOrder repairOrder, GxtWorkOrder workOrder)
+    public TableDataInfo list(GxtRepairOrder repairOrder, GxtWorkOrder workOrder, @Param("keyword") String keyword)
     {
         // 开启分页插件自动分页
         startPage();
         // 查询合并的工单列表
-        List<OrderScoreInfo> list = gxtOrderScoreService.selectMobileUnionOrderList(repairOrder, workOrder);
+        List<OrderScoreInfo> list = gxtOrderScoreService.selectMobileUnionOrderList(repairOrder, workOrder,keyword);
         return getDataTable(list);
     }
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/OrderScoreInfo.java

@@ -53,6 +53,7 @@ public class OrderScoreInfo {
     private String model;
 
     /** 派单时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date assignTime;
 
     /** 派单人ID */
@@ -62,6 +63,7 @@ public class OrderScoreInfo {
     private String assignUserName;
 
     /** 接单时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date acceptTime;
 
     /** 接单人ID */

ygtx-gxt/src/main/java/com/ygtx/gxt/mapper/GxtOrderScoreMapper.java

@@ -33,5 +33,5 @@ public interface GxtOrderScoreMapper {
      * @return 合并的工单列表
      */
     public List<OrderScoreInfo> selectMobileUnionOrderList(@Param("repairOrder") GxtRepairOrder repairOrder,
-                                                     @Param("workOrder") GxtWorkOrder workOrder);
+                                                     @Param("workOrder") GxtWorkOrder workOrder, @Param("keyword") String keyword);
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/IGxtOrderScoreService.java

@@ -62,5 +62,5 @@ public interface IGxtOrderScoreService {
      * @param workOrder 维保工单查询条件
      * @return 合并的工单列表
      */
-    public List<OrderScoreInfo> selectMobileUnionOrderList(GxtRepairOrder repairOrder, GxtWorkOrder workOrder);
+    public List<OrderScoreInfo> selectMobileUnionOrderList(GxtRepairOrder repairOrder, GxtWorkOrder workOrder, String keyword);
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtOrderScoreServiceImpl.java

@@ -1,8 +1,6 @@
 package com.ygtx.gxt.service.impl;
 
-import com.github.pagehelper.Constant;
 import com.ygtx.common.constant.Constants;
-import com.ygtx.common.constant.UserConstants;
 import com.ygtx.common.utils.SecurityUtils;
 import com.ygtx.gxt.domain.*;
 import com.ygtx.gxt.mapper.GxtOrderScoreMapper;
@@ -423,7 +421,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
     }
 
     @Override
-    public List<OrderScoreInfo> selectMobileUnionOrderList(GxtRepairOrder repairOrder, GxtWorkOrder workOrder) {
+    public List<OrderScoreInfo> selectMobileUnionOrderList(GxtRepairOrder repairOrder, GxtWorkOrder workOrder, String keyword) {
         // 添加业务特定的数据权限过滤
         addBusinessDataScopeFilter(repairOrder, workOrder);
 
@@ -438,7 +436,7 @@ public class GxtOrderScoreServiceImpl implements IGxtOrderScoreService {
             }
         }
         // 查询工单列表
-        List<OrderScoreInfo> orderList = gxtOrderScoreMapper.selectMobileUnionOrderList(repairOrder, workOrder);
+        List<OrderScoreInfo> orderList = gxtOrderScoreMapper.selectMobileUnionOrderList(repairOrder, workOrder,keyword);
         return orderList;
     }
 

ygtx-gxt/src/main/resources/mapper/gxt/GxtOrderScoreMapper.xml

@@ -256,6 +256,9 @@
         update_time as update_time
         FROM gxt_repair_order t
         <where>
+            <if test="keyword != null and keyword != ''">
+                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%'))
+            </if>
             <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no = #{repairOrder.workOrderProjectNo}</if>
             <if test="repairOrder.workOrderStatus != null and repairOrder.workOrderStatus != ''"> and work_order_status = #{repairOrder.workOrderStatus}</if>
             <if test="repairOrder.gxtCenterId != null"> and gxt_center_id = #{repairOrder.gxtCenterId}</if>
@@ -326,6 +329,9 @@
         update_time as update_time
         FROM gxt_work_order t
         <where>
+            <if test="keyword != null and keyword != ''">
+                and (work_order_project_no like concat('%', #{keyword}, '%') or pcs_device_name like concat('%', #{keyword}, '%'))
+            </if>
             <if test="workOrder.workOrderProjectNo != null and workOrder.workOrderProjectNo != ''"> and work_order_project_no = #{workOrder.workOrderProjectNo}</if>
             <if test="workOrder.workOrderStatus != null and workOrder.workOrderStatus != ''"> and work_order_status = #{workOrder.workOrderStatus}</if>
             <if test="workOrder.gxtCenterId != null"> and gxt_center_id = #{workOrder.gxtCenterId}</if>