From e4f50565f585ac3bb7355fe7b9da794bb855113f Mon Sep 17 00:00:00 2001
From: 曾富康 <1067864236@qq.com>
Date: 星期一, 22 六月 2026 16:28:35 +0800
Subject: [PATCH] 新增需求
---
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
index f9a1915..5d83e0d 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -42,13 +42,13 @@
@Override
public List<Map<String, Object>> getPrivateCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName,
- String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer abnormal,
+ String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer callType, Integer abnormal,
Integer promotion,
String promotionUser,
Integer abnormalStatus,
Integer payType, String travelId) {
List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId,
- driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, payType, travelId);
+ driver, state, rideType, callType, abnormal, promotion, promotionUser,abnormalStatus, payType, travelId);
for (Map<String, Object> map : privateCarOrderList) {
if(null == map.get("serverCarModelName")){
JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString());
@@ -76,12 +76,12 @@
}
@Override
public List<Map<String, Object>> getPrivateCarOrderListExport(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName,
- String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer abnormal,
+ String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer callType, Integer abnormal,
Integer promotion,
String promotionUser,
Integer abnormalStatus, String travelId) {
List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone,
- serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, travelId);
+ serverCarModelId, driver, state, rideType, callType, abnormal, promotion, promotionUser,abnormalStatus, travelId);
for (Map<String, Object> map : privateCarOrderList) {
if(null == map.get("serverCarModelName")){
JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString());
--
Gitblit v1.7.1