后台异常订单 车

liujie

5 天以前 60d755ccd24c740509562c59385578d601cd4e46

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java

@@ -7,10 +7,7 @@
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper;
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.OrderCancel;
import com.stylefeng.guns.modular.system.model.TOrderTaxi;
import com.stylefeng.guns.modular.system.model.TReassign;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +41,6 @@
    @Autowired
    private ITCompanyService companyService;
    
    @Autowired
    private ITLineService lineService;
    
    @Autowired
    private IIncomeService incomeService;
@@ -58,14 +53,33 @@
    public List<Map<String, Object>> getTaxiOrderList(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, String driver, Integer state,Integer abnormal,
                                                      Integer promotion,
                                                      String promotionUser,Integer abnormalStatus) {
        return this.baseMapper.getTaxiOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,abnormalStatus);
        List<Map<String, Object>> taxiOrderList = this.baseMapper.getTaxiOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser, abnormalStatus);
        for (Map<String, Object> map : taxiOrderList) {
            if(null != map.get("companyId")){
                TCompany company = companyService.selectById(map.get("companyId").toString());
                if(company!=null){
                    map.put("companyName", company.getName());
                }
            }
        }

        return taxiOrderList;
    }
    
    @Override
    public List<Map<String, Object>> getTaxiOrderListExport(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, String driver, Integer state,Integer abnormal,
                                                      Integer promotion,
                                                      String promotionUser,Integer abnormalStatus) {
        return this.baseMapper.getTaxiOrderListExport( beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,abnormalStatus);
        List<Map<String, Object>> taxiOrderListExport = this.baseMapper.getTaxiOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser, abnormalStatus);
        for (Map<String, Object> map : taxiOrderListExport) {
            if(null != map.get("companyId")){
                TCompany company = companyService.selectById(map.get("companyId").toString());
                if(company!=null){
                    map.put("companyName", company.getName());
                }
            }
        }
        return taxiOrderListExport;
    }

    @Override