From 0481353111afb43a2322e18530dde26f1d841ead Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:15:34 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java | 220 +++++--------------------------------------------------
1 files changed, 20 insertions(+), 200 deletions(-)
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java
index 9b199d8..658c15a 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java
@@ -20,7 +20,7 @@
public interface TReassignMapper extends BaseMapper<TReassign> {
/**
- * 根据条件查询快车改派订单列表
+ * 根据条件查询专车改派订单列表
*/
List<Map<String,Object>> getPrivateCarReassignOrderList(@Param("page") Page<Map<String, Object>> page,
@Param("roleType") Integer roleType,
@@ -36,7 +36,26 @@
@Param("state") Integer state);
+ /**
+ * 根据条件查询可被选择的专车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+
+ /**
+ * 根据条件查询可被选择的专车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("phone") String phone);
/**
* 根据条件查询跨城改派订单列表
@@ -71,64 +90,6 @@
@Param("orderState") Integer orderState,
@Param("state") Integer state);
-
- /**
- * 根据条件查询跨城改派订单列表
- */
- List<Map<String,Object>> getTaxiReassignOrderList(@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);
-
-
-
-
-
-
-
-
-
-
- /**
- * 根据条件查询可被选择的快车司机列表
- * @return
- */
- List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
- @Param("companyId") Integer companyId,
- @Param("name") String name,
- @Param("phone") String phone,
- @Param("driverId") Integer driverId);
-
-
-
- /**
- * 根据条件查询可被选择的快车司机列表
- * @return
- */
- List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
- @Param("companyId") Integer companyId,
- @Param("type") Integer type,
- @Param("name") String name,
- @Param("phone") String phone);
-
- /**
- * 根据条件查询可被选择的快车司机列表
- * @return
- */
- List<Map<String,Object>> getCanSelectTaxiCarDriverList(@Param("page") Page<Map<String, Object>> page,
- @Param("companyId") Integer companyId,
- @Param("name") String name,
- @Param("phone") String phone,
- @Param("driverId") Integer driverId);
-
/**
* 根据条件查询可被选择的跨城司机列表
* @return
@@ -143,145 +104,4 @@
@Param("name") String name,
@Param("phone") String phone,
@Param("driverId") Integer driverId);
-
- /**
- * 根据条件查询快车改派订单列表
- */
- List<Map<String,Object>> getPrivateCarReassignOrderListEx(
- @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>> getCrossReassignOrderListEx(
- @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>> getSmallPieceLogisticsListEx(
- @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>> getTaxiReassignOrderListEx(
- @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>> getPrivateCarReassignOrderListMoney(
- @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>> getCrossReassignOrderListMoney(
- @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>> getSmallPieceLogisticsListMoney(
- @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>> getTaxiReassignOrderListMoney(
- @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);
-
-
}
--
Gitblit v1.7.1