java/QianYunTong.git

			@@ -5,12 +5,11 @@
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.baomidou.mybatisplus.plugins.Page;
			import com.stylefeng.guns.core.base.controller.BaseController;
			import com.stylefeng.guns.core.beetl.ShiroExtUtil;
			import com.stylefeng.guns.core.common.constant.factory.PageFactory;
			import com.stylefeng.guns.core.shiro.ShiroKit;
			import com.stylefeng.guns.core.util.DateUtil;
			import com.stylefeng.guns.core.util.SinataUtil;


			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
			import com.stylefeng.guns.modular.system.model.*;
			@@ -19,7 +18,6 @@
			import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
			import com.stylefeng.guns.modular.system.util.PushURL;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import org.apache.commons.collections.CollectionUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Controller;
			@@ -133,14 +131,14 @@
			Integer rideType) {
			String beginTime = null;
			String endTime = null;
			if (SinataUtil.isNotEmpty(insertTime)){
			if (SinataUtil.isNotEmpty(insertTime)) {
			String[] timeArray = insertTime.split(" - ");
			beginTime = timeArray[0];
			endTime = timeArray[1];
			}
			Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
			page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),
			orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,rideType));
			page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(),
			orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType));
			return super.packForBT(page);
			}