From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

---
 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java
index 354bc96..26bb5c3 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java
@@ -105,4 +105,38 @@
                                                        @Param("orderState") Integer orderState,
                                                        @Param("state") Integer state);
 
+    /**
+     * 接送机改派列表
+     * @param page
+     * @param roleType
+     * @param nowUserId
+     * @param beginTime
+     * @param endTime
+     * @param originalDriverName
+     * @param originalDriverPhone
+     * @param orderNum
+     * @param nowDriverName
+     * @param nowDriverPhone
+     * @param orderState
+     * @param state
+     * @return
+     */
+    List<Map<String, Object>> getTransferOrderList(@Param("page") Page<Map<String, Object>> page,
+                                                   @Param("roleType") Integer roleType,
+                                                   @Param("nowUserId") Integer nowUserId,
+                                                   @Param("beginTime") String beginTime,
+                                                   @Param("endTime") String endTime,
+                                                   @Param("originalDriverName") String originalDriverName,
+                                                   @Param("originalDriverPhone") String originalDriverPhone,
+                                                   @Param("orderNum") String orderNum,
+                                                   @Param("nowDriverName") String nowDriverName,
+                                                   @Param("nowDriverPhone") String nowDriverPhone,
+                                                   @Param("orderState") Integer orderState,
+                                                   @Param("state") Integer state);
+
+    List<Map<String, Object>> getCanSelectTransferDriverList(@Param("page") Page<Map<String, Object>> page,
+                                                             @Param("companyId") Integer companyId,
+                                                             @Param("type") Integer type,
+                                                             @Param("name") String name,
+                                                             @Param("phone") String phone);
 }

--
Gitblit v1.7.1