我相关的工单

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/GxtOrderMineController.java

@@ -66,6 +66,20 @@ public class GxtOrderMineController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询我相关的工单列表（合并维修工单和维保工单）
+     */
+    @PreAuthorize("@ss.hasPermi('gxt:orderMine:listMyRelate')")
+    @GetMapping("/listMyRelate")
+    public TableDataInfo listMyRelate(GxtRepairOrder repairOrder, GxtWorkOrder workOrder)
+    {
+        // 开启分页插件自动分页
+        startPage();
+        // 查询合并的工单列表
+        List<OrderScoreInfo> list = gxtOrderMineService.selectUnionOrderListMyRelate(repairOrder, workOrder);
+        return getDataTable(list);
+    }
+
     /**
      * 获取工单详细信息
      */

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

@@ -31,5 +31,14 @@ public interface IGxtOrderMineService {
      * @param workOrder 维保工单查询条件
      * @return 合并的工单列表
      */
-    List<OrderScoreInfo> selectUnionOrderListMyDone(GxtRepairOrder repairOrder, GxtWorkOrder workOrder);
+    public List<OrderScoreInfo> selectUnionOrderListMyDone(GxtRepairOrder repairOrder, GxtWorkOrder workOrder);
+
+    /**
+     * 查询我相关的工单列表（合并维修工单和维保工单）
+     *
+     * @param repairOrder 维修工单查询条件
+     * @param workOrder 维保工单查询条件
+     * @return 合并的工单列表
+     */
+    public List<OrderScoreInfo> selectUnionOrderListMyRelate(GxtRepairOrder repairOrder, GxtWorkOrder workOrder);
 }

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

@@ -74,29 +74,52 @@ public class GxtOrderMineServiceImpl implements IGxtOrderMineService {
 
     @Override
     public List<OrderScoreInfo> selectUnionOrderListMyDone(GxtRepairOrder repairOrder, GxtWorkOrder workOrder) {
-        //添加处理人员过滤，GxtRepairOrder从对应的GxtRepairOrderPerson取userId和GxtRepairOrderFlow取operatorId即是对应的处理人员，
-        // GxtWorkOrder从对应的GxtWorkOrderPerson取userId和GxtWorkOrderFlow即是对应的处理人员，
+        //添加处理人员过滤，GxtRepairOrder从对应的GxtRepairOrderFlow取operatorId即是对应的处理人员，
+        // GxtWorkOrder从对应的GxtWorkOrderFlow取operatorId即是对应的处理人员，
         // 只要能对应当前登录用户，就查询出来，
         Long currentUserId = SecurityUtils.getUserId();
-        
+
         // 构建维修工单的处理人员过滤条件
         StringBuilder repairFilterSql = new StringBuilder();
-        repairFilterSql.append(" AND (EXISTS(SELECT 1 FROM gxt_repair_order_person p WHERE p.order_id = t.id AND p.user_id = ")
+        repairFilterSql.append(" AND (EXISTS(SELECT 1 FROM gxt_repair_order_flow f WHERE f.order_id = t.id AND f.operator_id = ")
                 .append(currentUserId)
-                .append(") OR EXISTS(SELECT 1 FROM gxt_repair_order_flow f WHERE f.order_id = t.id AND f.operator_id = ")
+                .append("))");
+        repairOrder.getParams().put("businessDataScope", repairFilterSql.toString());
+
+        // 构建维保工单的处理人员过滤条件
+        StringBuilder workFilterSql = new StringBuilder();
+        workFilterSql.append(" AND (EXISTS(SELECT 1 FROM gxt_work_order_flow f WHERE f.order_id = t.id AND f.operator_id = ")
+                .append(currentUserId)
+                .append("))");
+        workOrder.getParams().put("businessDataScope", workFilterSql.toString());
+
+        // 查询工单列表
+        List<OrderScoreInfo> orderList = gxtOrderMineMapper.selectUnionOrderList(repairOrder, workOrder);
+
+        return orderList;
+    }
+
+    @Override
+    public List<OrderScoreInfo> selectUnionOrderListMyRelate(GxtRepairOrder repairOrder, GxtWorkOrder workOrder) {
+        //添加处理人员过滤，GxtRepairOrder从对应的GxtRepairOrderPerson取userId即是对应的相关人员，
+        // GxtWorkOrder从对应的GxtWorkOrderPerson取userId即是对应的相关人员，
+        // 只要能对应当前登录用户，就查询出来，
+        Long currentUserId = SecurityUtils.getUserId();
+
+        // 构建维修工单的处理人员过滤条件
+        StringBuilder repairFilterSql = new StringBuilder();
+        repairFilterSql.append(" AND (EXISTS(SELECT 1 FROM gxt_repair_order_person p WHERE p.order_id = t.id AND p.user_id = ")
                 .append(currentUserId)
                 .append("))");
         repairOrder.getParams().put("businessDataScope", repairFilterSql.toString());
-        
+
         // 构建维保工单的处理人员过滤条件
         StringBuilder workFilterSql = new StringBuilder();
         workFilterSql.append(" AND (EXISTS(SELECT 1 FROM gxt_work_order_person p WHERE p.order_id = t.id AND p.user_id = ")
-                .append(currentUserId)
-                .append(") OR EXISTS(SELECT 1 FROM gxt_work_order_flow f WHERE f.order_id = t.id AND f.operator_id = ")
                 .append(currentUserId)
                 .append("))");
         workOrder.getParams().put("businessDataScope", workFilterSql.toString());
-        
+
         // 查询工单列表
         List<OrderScoreInfo> orderList = gxtOrderMineMapper.selectUnionOrderList(repairOrder, workOrder);
 

ygtx-ui/src/api/gxt/orderMine.js

@@ -18,6 +18,15 @@ export function listMyDone(query) {
   })
 }
 
+// 查询我相关的工单列表（合并维修工单和维保工单）
+export function listMyRelate(query) {
+  return request({
+    url: '/gxt/orderMine/listMyRelate',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询工单详细信息
 export function getOrderInfo(orderType, orderId) {
   return request({