修改文档bug

Pu Zhibing

6 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -16,8 +16,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
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;
@@ -80,8 +79,21 @@

    @Value("${spring.mail.template-path}")
    private String templatePath;


    
    @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;

    /**
     * 跳转到司机审核列表首页
@@ -106,7 +118,8 @@
     */
    @RequestMapping("/tDriver_add")
    public String tDriverAdd(Model model) {
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
                .eq("state", 0).ne("flag", 3));
        model.addAttribute("companyList",companyList);

        Integer roleType = ShiroKit.getUser().getRoleType();
@@ -185,17 +198,17 @@
        model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());

        if (1 == roleType){
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            model.addAttribute("companyList",companyList);
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()).eq("state", 0).ne("flag", 3));
            model.addAttribute("franchiseeList",franchiseeList);
        }else if (2 == roleType){
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
            model.addAttribute("franchiseeList",franchiseeList);
        }

        //查询平台ID
        TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
        TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).eq("state", 0).ne("flag", 3));
        //判断是平台司机还是加盟司机
        if ((SinataUtil.isEmpty(tDriver.getCompanyId()) || tDriver.getCompanyId() == 0 || tDriver.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tDriver.getFranchiseeId()) || tDriver.getFranchiseeId() == 0)){
            model.addAttribute("companyType",1);
@@ -258,7 +271,6 @@
        model.addAttribute("id", id);
        return PREFIX + "training.html";
    }


    /**
     * 保存培训数据
@@ -329,7 +341,6 @@
        return ResultUtil.success(driverTrains);
    }


    /**
     * 跳转到处罚页
     * @param id
@@ -341,7 +352,6 @@
        model.addAttribute("id", id);
        return PREFIX + "punish.html";
    }


    /**
     * 保存处罚数据
@@ -405,7 +415,6 @@
        return ResultUtil.success();
    }


    /**
     * 获取所有处罚数据
     * @param driverId
@@ -417,7 +426,6 @@
        List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
        return ResultUtil.success(driverPunishes);
    }


    /**
     * 根据分公司ID获取加盟商
@@ -473,7 +481,8 @@
    public Object listYesDriver(String insertTime,
                       String companyName,
                       String phone,
                       String name,
                       String lastName,
                                String firstName,
                       Integer addType,
                       Integer authState,
                       Integer state,
@@ -486,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);
    }

@@ -515,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=不通过
@@ -589,7 +584,6 @@
                type = 6;
                tDriver.setAuthState(4);
            }

            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -613,9 +607,9 @@
                        driver_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
                        Element driver_audit1_content = document.getElementById("driver_audit1_content");
                        if(1 == authState){
                            driver_audit1_content.text("You application has been approved.");
                            driver_audit1_content.text("Your application has been approved.");
                        }else{
                            driver_audit1_content.text("I'm sorry, your application was rejected. Reason for rejection: Incomplete filling in personal information.");
                            driver_audit1_content.text("We are sorry to inform you that your application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
                        }
                        EmailUtil.send(tDriver.getEmail(), 1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified",  document.html());
                    }catch (Exception e){
@@ -710,6 +704,11 @@
        }
        tDriver.setPhone(phone);
        tDriver.setAccount(phone);
        tDriver.setBalance(new BigDecimal(0));
//        tDriver.setCommission(new BigDecimal(0));
//        tDriver.setCouponBalance(new BigDecimal(0));
//        tDriver.setBackgroundBalance(new BigDecimal(0));

        tDriverService.insert(tDriver);

        //添加经营业务
@@ -730,7 +729,7 @@

        return SUCCESS_TIP;
    }

    
    /**
     * 添加线路
     * @param subArr
@@ -750,7 +749,6 @@
        }
    }


    /**
     * 删除司机审核列表
     */
@@ -762,6 +760,7 @@
        tDriverService.updateById(driver);
        return SUCCESS_TIP;
    }

    /**
     * 操作司机状态
     */
@@ -773,6 +772,10 @@
            if (1 == optType){  //解冻
                tDriver.setAuthState(2);
            }else if (2 == optType){  //冻结
                String token = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
                redisUtil.remove(token);//删除个人信息数据
                redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
                redisUtil.remove("DRIVER_" + driverId);//清除存储的token
                tDriver.setAuthState(3);
            }
            tDriver.setRemark(remark);
@@ -1780,15 +1783,6 @@
        return SUCCESS_TIP;
    }




    @Autowired
    private ITCompanyService itCompanyService;

    @Autowired
    private ITDriverServiceService itDriverServiceService;

    /**
     * 验证是否可以字符转为整数
     * @param str
@@ -1880,8 +1874,8 @@
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("name"))){
                shellList.add(object.get("name").toString());
            if(SinataUtil.isNotEmpty(object.get("firstName"))){
                shellList.add(object.get("firstName").toString() + " " + object.get("lastName").toString());
            }else{
                shellList.add("-");
            }
@@ -1891,7 +1885,7 @@
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("sex"))){
                shellList.add(object.get("sex").toString() == "1"?"男":"女");
                shellList.add(object.get("sex").toString().equals("1")?"男":"女");
            }else{
                shellList.add("-");
            }
@@ -1958,8 +1952,6 @@
            }
            if(SinataUtil.isNotEmpty(object.get("authState"))){
                shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));

                shellList.add(object.get("authState").toString());
            }else{
                shellList.add("-");
            }