Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java

@@ -104,4 +104,39 @@
                                                         @Param("name") String name,
                                                         @Param("phone") String phone,
                                                         @Param("driverId") Integer driverId);

    /**
     * 接送机改派列表
     * @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);
}