Merge remote-tracking branch 'origin/master'

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

@@ -42,12 +42,12 @@ public class GxtMobileOrderController extends BaseController
      * 查询超时工单列表
      */
     @GetMapping("/overdue")
-    public TableDataInfo overdueList(GxtWorkOrder workOrder)
+    public TableDataInfo overdueList(GxtWorkOrder workOrder, @Param("keyword") String keyword)
     {
         // 开启分页插件自动分页
         startPage();
         // 查询超时工单列表
-        List<GxtWorkOrder> list = gxtWorkOrderService.selectOverdueWorkOrderList(workOrder);
+        List<GxtWorkOrder> list = gxtWorkOrderService.selectOverdueWorkOrderList(workOrder, keyword);
         // 计算超时时间并格式化为X天X小时格式
         for (GxtWorkOrder order : list) {
             if (order.getPlanEndTime() != null && order.getRealEndTime() == null) {
@@ -74,12 +74,12 @@ public class GxtMobileOrderController extends BaseController
      * 查询即将超时工单列表
      */
     @GetMapping("/almostOverdue")
-    public TableDataInfo almostOverdueList(GxtWorkOrder workOrder)
+    public TableDataInfo almostOverdueList(GxtWorkOrder workOrder, @Param("keyword") String keyword)
     {
         // 开启分页插件自动分页
         startPage();
         // 查询即将超时工单列表
-        List<GxtWorkOrder> list = gxtWorkOrderService.selectAlmostOverdueWorkOrderList(workOrder);
+        List<GxtWorkOrder> list = gxtWorkOrderService.selectAlmostOverdueWorkOrderList(workOrder, keyword);
         // 计算还差多少时间超时并格式化为X天X小时格式
         for (GxtWorkOrder order : list) {
             if (order.getPlanEndTime() != null && order.getRealEndTime() == null) {
@@ -90,12 +90,12 @@ public class GxtMobileOrderController extends BaseController
                 long hours = diffInHours % 24;
                 if (days > 0) {
                     if (hours > 0) {
-                        order.setRemark("剩余" + days + "天" + hours + "小时超时");
+                        order.setRemark("剩余" + days + "天" + hours + "小时");
                     } else {
-                        order.setRemark("剩余" + days + "天超时");
+                        order.setRemark("剩余" + days + "天");
                     }
                 } else {
-                    order.setRemark("剩余" + diffInHours + "小时超时");
+                    order.setRemark("剩余" + diffInHours + "小时");
                 }
             }
         }

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

@@ -222,7 +222,7 @@ public interface IGxtWorkOrderService {
      * @param gxtWorkOrder 维保工单查询条件
      * @return 超时工单列表
      */
-    public List<GxtWorkOrder> selectOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder);
+    public List<GxtWorkOrder> selectOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder,String keyword);
 
     /**
      * 查询即将超时工单列表
@@ -230,5 +230,5 @@ public interface IGxtWorkOrderService {
      * @param gxtWorkOrder 维保工单查询条件
      * @return 即将超时工单列表
      */
-    public List<GxtWorkOrder> selectAlmostOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder);
+    public List<GxtWorkOrder> selectAlmostOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder, String keyword);
 }

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

@@ -1930,39 +1930,41 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 
     /**
      * 查询超时工单列表
-     *
+     * 
      * @param gxtWorkOrder 维保工单查询条件
      * @return 超时工单列表
      */
     @Override
-    public List<GxtWorkOrder> selectOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder) {
+    public List<GxtWorkOrder> selectOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder, String keyword) {
         // 添加业务特定的数据权限过滤
         addBusinessDataScopeFilter(gxtWorkOrder);
-
+        
         // 查询超时工单：realEndTime为空且当前时间超过planEndTime
         gxtWorkOrder.setParams(new HashMap<>());
         gxtWorkOrder.getParams().put("overdueCondition", "overdue");
+        gxtWorkOrder.getParams().put("keyword", keyword);
 
         return gxtWorkOrderMapper.selectGxtWorkOrderList(gxtWorkOrder);
     }
 
     /**
      * 查询即将超时工单列表
-     *
+     * 
      * @param gxtWorkOrder 维保工单查询条件
      * @return 即将超时工单列表
      */
     @Override
-    public List<GxtWorkOrder> selectAlmostOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder) {
+    public List<GxtWorkOrder> selectAlmostOverdueWorkOrderList(GxtWorkOrder gxtWorkOrder, String keyword) {
         // 添加业务特定的数据权限过滤
         addBusinessDataScopeFilter(gxtWorkOrder);
-
+        
         // 查询所有未完成的工单（realEndTime为空且planEndTime大于当前时间）
         gxtWorkOrder.setParams(new HashMap<>());
         gxtWorkOrder.getParams().put("overdueCondition", "almostOverdue");
+        gxtWorkOrder.getParams().put("keyword", keyword);
 
         List<GxtWorkOrder> allOrders = gxtWorkOrderMapper.selectGxtWorkOrderList(gxtWorkOrder);
-
+        
         // 获取超时配置
         String timeoutConfig = configService.selectConfigByKey("gxt.order.timeout");
         int timeoutHours = 24; // 默认24小时
@@ -1974,7 +1976,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
                 logger.warn("Invalid gxt.order.timeout config value: {}, using default 24 hours", timeoutConfig);
             }
         }
-
+        
         // 过滤即将超时的工单
         List<GxtWorkOrder> almostOverdueOrders = new ArrayList<>();
         Date now = new Date();
@@ -1988,7 +1990,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
                 }
             }
         }
-
+        
         return almostOverdueOrders;
     }
 }

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

@@ -135,6 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     SELECT config_value FROM sys_config WHERE config_key = 'gxt.order.timeout' LIMIT 1
                 )
             </if>
+            <if test="params.keyword != null and params.keyword != ''">
+                and (work_order_project_no like concat('%', #{params.keyword}, '%') or pcs_device_name like concat('%', #{params.keyword}, '%'))
+            </if>
             <!-- 业务特定数据权限过滤条件 -->
             <if test="params.businessDataScope != null and params.businessDataScope != ''">
                 ${params.businessDataScope}