Pu Zhibing
6 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -11,13 +11,13 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.WoUtil;
import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -82,8 +82,18 @@
    
    @Autowired
    private RedisUtil redisUtil;
    @Autowired
    private IIncomeService incomeService;
    @Autowired
    private ITUserService userService;
    @Autowired
    private IUserActivityInviteService userActivityInviteService;
    @Autowired
    private IDriverActivityRegisteredService driverActivityRegisteredService;
    @Autowired
    private ITCompanyService itCompanyService;
    @Autowired
    private ITDriverServiceService itDriverServiceService;
    /**
     * 跳转到司机审核列表首页
@@ -262,7 +272,6 @@
        return PREFIX + "training.html";
    }
    /**
     * 保存培训数据
     * @param train
@@ -332,7 +341,6 @@
        return ResultUtil.success(driverTrains);
    }
    /**
     * 跳转到处罚页
     * @param id
@@ -344,7 +352,6 @@
        model.addAttribute("id", id);
        return PREFIX + "punish.html";
    }
    /**
     * 保存处罚数据
@@ -408,7 +415,6 @@
        return ResultUtil.success();
    }
    /**
     * 获取所有处罚数据
     * @param driverId
@@ -420,7 +426,6 @@
        List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
        return ResultUtil.success(driverPunishes);
    }
    /**
     * 根据分公司ID获取加盟商
@@ -476,7 +481,8 @@
    public Object listYesDriver(String insertTime,
                       String companyName,
                       String phone,
                       String name,
                       String lastName,
                                String firstName,
                       Integer addType,
                       Integer authState,
                       Integer state,
@@ -489,7 +495,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tDriverService.getDriverList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,companyName,phone,name,addType,authState,state,teamId));
        page.setRecords(tDriverService.getDriverList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,companyName,phone,lastName,firstName,addType,authState,state,teamId));
        return super.packForBT(page);
    }
@@ -518,20 +524,6 @@
        return super.packForBT(page);
    }
    @Autowired
    private IIncomeService incomeService;
    @Autowired
    private ITUserService userService;
    @Autowired
    private IUserActivityInviteService userActivityInviteService;
    @Autowired
    private IDriverActivityRegisteredService driverActivityRegisteredService;
    /**
     * 审核操作  1=通过 2=不通过
@@ -756,7 +748,6 @@
            tDriverLineService.insert(line);
        }
    }
    /**
     * 删除司机审核列表
@@ -1791,15 +1782,6 @@
        }
        return SUCCESS_TIP;
    }
    @Autowired
    private ITCompanyService itCompanyService;
    @Autowired
    private ITDriverServiceService itDriverServiceService;
    /**
     * 验证是否可以字符转为整数