修改 bug

Pu Zhibing

2024-12-24 51a0a7ac431f11683958c8e4972f78c52a5dedb2

修改 bug

 ManagementAHTravel/guns-admin/pom.xml

@@ -4,8 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
   

    <artifactId>guns-admin</artifactId>
    <artifactId>admin</artifactId>
    <name>guns-admin</name>
    <version>0.0.1</version>
    <description>guns 的spring boot版本</description>
     <parent>
        <groupId>com.stylefeng</groupId>

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java

@@ -192,8 +192,8 @@
        activityGeneralizationService.insert(tActivityGeneralization);

        // 生成二维码，上传到服务器
        MyQrCodeUtil.createCodeToFile("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        BufferedImage qrCodeImage = QRCodeUtil.createImage("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        MyQrCodeUtil.createCodeToFile("http://1.95.8.79/share_coupon?id=" + tActivityGeneralization.getId());
        BufferedImage qrCodeImage = QRCodeUtil.createImage("http://1.95.8.79/share_coupon?id=" + tActivityGeneralization.getId());
        MultipartFile qrCodeFile = convert(qrCodeImage, new Date().getTime()+ UUIDUtil.getRandomCode(3)+".PNG");
        String picture = ObsUploadUtil.obsUpload(qrCodeFile);
        System.err.println("二维码："+ picture);

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

@@ -10,6 +10,7 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
import com.stylefeng.guns.modular.system.model.*;
@@ -20,10 +21,7 @@
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.commons.lang.time.DateUtils;
import org.apache.poi.hdf.extractor.TC;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +37,7 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 司机审核列表控制器
@@ -78,6 +77,9 @@

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;
    
    @Autowired
    private ITLineCompanyService lineCompanyService;



@@ -240,8 +242,14 @@
        model.addAttribute("seven",seven);

        //查询线路列表
        List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
        model.addAttribute("lineList",lineList);
        List<TLineCompany> lineCompanies = lineCompanyService.selectList(new EntityWrapper<TLineCompany>().eq("companyId", tDriver.getCompanyId()));
        if(lineCompanies.size() > 0){
            List<Integer> collect = lineCompanies.stream().map(TLineCompany::getLineId).collect(Collectors.toList());
            List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1).in("id", collect));
            model.addAttribute("lineList",lineList);
        }else{
            model.addAttribute("lineList",new ArrayList<>());
        }
        //查询驾驶员已添加的线路列表
        List<Map<String, Object>> driverLineList = tDriverLineService.getDriverLineListByDriverId(tDriverId);
        model.addAttribute("driverLineList",driverLineList);
@@ -911,11 +919,7 @@
            shellList.add("出租车资格证号");
            shellList.add("工号[选填]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:跨城[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
            shellList.add("经营业务:小件跨城物流[是/否]");
            shellList.add("经营业务:包车[是/否]");
            shellList.add("登录账号[手机号]");
            shellList.add("登录密码[密码长度为6-18]");
        }else if (ShiroKit.getUser().getRoleType() == 2){
@@ -931,11 +935,7 @@
            shellList.add("出租车资格证号");
            shellList.add("工号[选填]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:跨城[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
            shellList.add("经营业务:小件跨城物流[是/否]");
            shellList.add("经营业务:包车[是/否]");
            shellList.add("登录账号[手机号]");
            shellList.add("登录密码[密码长度为6-18]");
        }else if (ShiroKit.getUser().getRoleType() == 3){
@@ -950,11 +950,7 @@
            shellList.add("出租车资格证号");
            shellList.add("工号[选填]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:跨城[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
            shellList.add("经营业务:小件跨城物流[是/否]");
            shellList.add("经营业务:包车[是/否]");
            shellList.add("登录账号[手机号]");
            shellList.add("登录密码[密码长度为6-18]");
        }
@@ -1018,19 +1014,31 @@
                    Cell cell5 = row.getCell(5);  //驾驶证号码
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        five = String.valueOf(cell5.getStringCellValue()).trim();
                        if(cell5.getCellType().equals(CellType.NUMERIC)){
                            five = String.valueOf(cell5.getNumericCellValue()).trim();
                        }else{
                            five = String.valueOf(cell5.getStringCellValue()).trim();
                        }
                    }

                    Cell cell6 = row.getCell(6);  //驾龄
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        six = String.valueOf(cell6.getStringCellValue()).trim();
                        if(cell6.getCellType().equals(CellType.NUMERIC)){
                            six = String.valueOf(cell6.getNumericCellValue()).trim();
                        }else{
                            six = String.valueOf(cell6.getStringCellValue()).trim();
                        }
                    }

                    Cell cell7 = row.getCell(7);  //身份证号
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        seven = String.valueOf(cell7.getStringCellValue()).trim();
                        if(cell7.getCellType().equals(CellType.NUMERIC)){
                            seven = String.valueOf(cell7.getNumericCellValue()).trim();
                        }else{
                            seven = String.valueOf(cell7.getStringCellValue()).trim();
                        }
                    }

                    Cell cell8 = row.getCell(8);  //居住地址
@@ -1042,13 +1050,21 @@
                    Cell cell9 = row.getCell(9);  //出租车资格证号
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
                        if(cell9.getCellType().equals(CellType.NUMERIC)){
                            nine = String.valueOf(cell9.getNumericCellValue()).trim();
                        }else{
                            nine = String.valueOf(cell9.getStringCellValue()).trim();
                        }
                    }

                    Cell cell10 = row.getCell(10);  //工号[选填]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                        if(cell10.getCellType().equals(CellType.NUMERIC)){
                            ten = String.valueOf(cell10.getNumericCellValue()).trim();
                        }else{
                            ten = String.valueOf(cell10.getStringCellValue()).trim();
                        }
                    }

                    Cell cell11 = row.getCell(11);  //经营业务:专车[是/否]
@@ -1057,52 +1073,35 @@
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                    }

                    Cell cell12 = row.getCell(12);  //经营业务:专车[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        twelve = String.valueOf(cell12.getStringCellValue()).trim();
                    }

                    Cell cell13 = row.getCell(13);  //经营业务:跨城出行[是/否]
                    Cell cell13 = row.getCell(12);  //经营业务:跨城出行[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                    }

                    Cell cell14 = row.getCell(14);  //经营业务:小件同城物流[是/否]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell14)){
                        fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                    }

                    Cell cell15 = row.getCell(15);  //经营业务:小件跨城物流[是/否]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                    }

                    Cell cell16 = row.getCell(16);  //经营业务:包车[是/否]
                    String sixteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                    }

                    Cell cell17 = row.getCell(17);  //登录账号[手机号]
                    Cell cell17 = row.getCell(13);  //登录账号[手机号]
                    String seventeen = null;
                    if (SinataUtil.isNotEmpty(cell17)){
                        seventeen = String.valueOf(cell17.getStringCellValue()).trim();
                        if(cell17.getCellType().equals(CellType.NUMERIC)){
                            seventeen = String.valueOf(cell17.getNumericCellValue()).trim();
                        }else{
                            seventeen = String.valueOf(cell17.getStringCellValue()).trim();
                        }
                    }

                    Cell cell18 = row.getCell(18);  //登录密码[密码长度为6-18]
                    Cell cell18 = row.getCell(14);  //登录密码[密码长度为6-18]
                    String eighteen = null;
                    if (SinataUtil.isNotEmpty(cell18)){
                        eighteen = String.valueOf(cell18.getStringCellValue()).trim();
                        if(cell18.getCellType().equals(CellType.NUMERIC)){
                            eighteen = String.valueOf(cell18.getNumericCellValue()).trim();
                        }else{
                            eighteen = String.valueOf(cell18.getStringCellValue()).trim();
                        }
                    }

                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(nine)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
                            || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(thirteen)
                            || SinataUtil.isEmpty(seventeen)|| SinataUtil.isEmpty(eighteen)){
                        return new ErrorTip(500, "单元格不能为空");
                    }else{
@@ -1124,25 +1123,9 @@
                        if (!eleven.equals("是") && !eleven.equals("否")){
                            return new ErrorTip(500, "经营业务【专车】内容不正确");
                        }
                        //判断经营业务【出租车】
                        if (!twelve.equals("是") && !twelve.equals("否")){
                            return new ErrorTip(500, "经营业务【出租车】内容不正确");
                        }
                        //判断经营业务【跨城出行】
                        if (!thirteen.equals("是") && !thirteen.equals("否")){
                            return new ErrorTip(500, "经营业务【跨城】内容不正确");
                        }
                        //判断经营业务【小件同城物流】
                        if (!fourteen.equals("是") && !fourteen.equals("否")){
                            return new ErrorTip(500, "经营业务【小件同城物流】内容不正确");
                        }
                        //判断经营业务【小件跨城物流】
                        if (!fifteen.equals("是") && !fifteen.equals("否")){
                            return new ErrorTip(500, "经营业务【小件跨城物流】内容不正确");
                        }
                        //判断经营业务【包车】
                        if (!sixteen.equals("是") && !sixteen.equals("否")){
                            return new ErrorTip(500, "经营业务【包车】内容不正确");
                        }
                        //判断驾龄
                        if (!isInteger(six)){
@@ -1199,7 +1182,7 @@
                        }
                        driver.setCompanyId(companyId);
                        driver.setFranchiseeId(franchiseeId);
                        driver.setState(2);
                        driver.setState(1);
                        driver.setAuthState(2);
                        driver.setFlag("1");
                        driver.setInsertUser(ShiroKit.getUser().getId());
@@ -1219,39 +1202,11 @@
                            service.setType(1);
                            itDriverServiceService.insert(service);
                        }
                        //添加出租车服务模式
                        if ("是".equals(twelve)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(2);
                            itDriverServiceService.insert(service);
                        }
                        //添加跨城出行服务模式
                        if ("是".equals(thirteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(3);
                            itDriverServiceService.insert(service);
                        }
                        //添加小件同城物流服务模式
                        if ("是".equals(fourteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(4);
                            itDriverServiceService.insert(service);
                        }
                        //添加小件跨城物流服务模式
                        if ("是".equals(fifteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(5);
                            itDriverServiceService.insert(service);
                        }
                        //添加包车服务模式
                        if ("是".equals(sixteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(6);
                            itDriverServiceService.insert(service);
                        }
                    }
@@ -1283,19 +1238,31 @@
                    Cell cell3 = row.getCell(3);  //驾驶证号码
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        three = String.valueOf(cell3.getStringCellValue()).trim();
                        if(cell3.getCellType().equals(CellType.NUMERIC)){
                            three = String.valueOf(cell3.getNumericCellValue()).trim();
                        }else{
                            three = String.valueOf(cell3.getStringCellValue()).trim();
                        }
                    }

                    Cell cell4 = row.getCell(4);  //驾龄
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        four = String.valueOf(cell4.getStringCellValue()).trim();
                        if(cell4.getCellType().equals(CellType.NUMERIC)){
                            four = String.valueOf(cell4.getNumericCellValue()).trim();
                        }else{
                            four = String.valueOf(cell4.getStringCellValue()).trim();
                        }
                    }

                    Cell cell5 = row.getCell(5);  //身份证号
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        five = String.valueOf(cell5.getStringCellValue()).trim();
                        if(cell5.getCellType().equals(CellType.NUMERIC)){
                            five = String.valueOf(cell5.getNumericCellValue()).trim();
                        }else{
                            five = String.valueOf(cell5.getStringCellValue()).trim();
                        }
                    }

                    Cell cell6 = row.getCell(6);  //居住地址
@@ -1307,13 +1274,21 @@
                    Cell cell7 = row.getCell(7);  //出租车资格证号
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        seven = String.valueOf(cell7.getStringCellValue()).trim();
                        if(cell7.getCellType().equals(CellType.NUMERIC)){
                            seven = String.valueOf(cell7.getNumericCellValue()).trim();
                        }else{
                            seven = String.valueOf(cell7.getStringCellValue()).trim();
                        }
                    }

                    Cell cell8 = row.getCell(8);  //工号[选填]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        eight = String.valueOf(cell8.getStringCellValue()).trim();
                        if(cell8.getCellType().equals(CellType.NUMERIC)){
                            eight = String.valueOf(cell8.getNumericCellValue()).trim();
                        }else{
                            eight = String.valueOf(cell8.getStringCellValue()).trim();
                        }
                    }

                    Cell cell9 = row.getCell(9);  //经营业务:专车[是/否]
@@ -1322,52 +1297,35 @@
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
                    }

                    Cell cell10 = row.getCell(10);  //经营业务:出租车[是/否]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                    }

                    Cell cell11 = row.getCell(11);  //经营业务:跨城出行[是/否]
                    Cell cell11 = row.getCell(10);  //经营业务:跨城出行[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                    }

                    Cell cell12 = row.getCell(12);  //经营业务:小件同城物流[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        twelve = String.valueOf(cell12.getStringCellValue()).trim();
                    }

                    Cell cell13 = row.getCell(13);  //经营业务:小件跨城物流[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                    }

                    Cell cell14 = row.getCell(14);  //经营业务:包车[是/否]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell14)){
                        fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                    }

                    Cell cell15 = row.getCell(15);  //登录账号[手机号]
                    Cell cell15 = row.getCell(11);  //登录账号[手机号]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                        if(cell15.getCellType().equals(CellType.NUMERIC)){
                            fifteen = String.valueOf(cell15.getNumericCellValue()).trim();
                        }else{
                            fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                        }
                    }

                    Cell cell16 = row.getCell(16);  //登录密码[密码长度为6-18]
                    Cell cell16 = row.getCell(12);  //登录密码[密码长度为6-18]
                    String sixteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                        if(cell16.getCellType().equals(CellType.NUMERIC)){
                            sixteen = String.valueOf(cell16.getNumericCellValue()).trim();
                        }else{
                            sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                        }
                    }
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(seven)
                            || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
                            || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)){
                            || SinataUtil.isEmpty(nine)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)){
                        return new ErrorTip(500, "单元格不能为空");
                    }else{
                        //判断账号是否存在
@@ -1383,25 +1341,9 @@
                        if (!nine.equals("是") && !nine.equals("否")){
                            return new ErrorTip(500, "经营业务【专车】内容不正确");
                        }
                        //判断经营业务【出租车】
                        if (!ten.equals("是") && !ten.equals("否")){
                            return new ErrorTip(500, "经营业务【出租车】内容不正确");
                        }
                        //判断经营业务【跨城出行】
                        if (!eleven.equals("是") && !eleven.equals("否")){
                            return new ErrorTip(500, "经营业务【跨城】内容不正确");
                        }
                        //判断经营业务【小件同城物流】
                        if (!twelve.equals("是") && !twelve.equals("否")){
                            return new ErrorTip(500, "经营业务【小件同城物流】内容不正确");
                        }
                        //判断经营业务【小件跨城物流】
                        if (!thirteen.equals("是") && !thirteen.equals("否")){
                            return new ErrorTip(500, "经营业务【小件跨城物流】内容不正确");
                        }
                        //判断经营业务【包车】
                        if (!fourteen.equals("是") && !fourteen.equals("否")){
                            return new ErrorTip(500, "经营业务【包车】内容不正确");
                        }
                        //判断驾龄
                        if (!isInteger(four)){
@@ -1445,7 +1387,7 @@
                        driver.setCompanyId(companyId);
                        driver.setFranchiseeId(franchiseeId);
                        driver.setState(1);
                        driver.setAuthState(1);
                        driver.setAuthState(2);
                        driver.setFlag("1");
                        driver.setInsertUser(ShiroKit.getUser().getId());
                        driver.setInsertTime(new Date());
@@ -1463,39 +1405,12 @@
                            service.setType(1);
                            itDriverServiceService.insert(service);
                        }
                        //添加出租车服务模式
                        if ("是".equals(ten)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(2);
                            itDriverServiceService.insert(service);
                        }
                      
                        //添加跨城出行服务模式
                        if ("是".equals(eleven)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(3);
                            itDriverServiceService.insert(service);
                        }
                        //添加小件同城物流服务模式
                        if ("是".equals(twelve)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(4);
                            itDriverServiceService.insert(service);
                        }
                        //添加小件跨城物流服务模式
                        if ("是".equals(thirteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(5);
                            itDriverServiceService.insert(service);
                        }
                        //添加包车服务模式
                        if ("是".equals(fourteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(6);
                            itDriverServiceService.insert(service);
                        }

@@ -1522,19 +1437,31 @@
                    Cell cell3 = row.getCell(2);  //驾驶证号码
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        two = String.valueOf(cell3.getStringCellValue()).trim();
                        if(cell3.getCellType().equals(CellType.NUMERIC)){
                            two = String.valueOf(cell3.getNumericCellValue()).trim();
                        }else{
                            two = String.valueOf(cell3.getStringCellValue()).trim();
                        }
                    }

                    Cell cell4 = row.getCell(3);  //驾龄
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        three = String.valueOf(cell4.getStringCellValue()).trim();
                        if(cell4.getCellType().equals(CellType.NUMERIC)){
                            three = String.valueOf(cell4.getNumericCellValue()).trim();
                        }else{
                            three = String.valueOf(cell4.getStringCellValue()).trim();
                        }
                    }

                    Cell cell5 = row.getCell(4);  //身份证号
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        four = String.valueOf(cell5.getStringCellValue()).trim();
                        if(cell5.getCellType().equals(CellType.NUMERIC)){
                            four = String.valueOf(cell5.getNumericCellValue()).trim();
                        }else{
                            four = String.valueOf(cell5.getStringCellValue()).trim();
                        }
                    }

                    Cell cell6 = row.getCell(5);  //居住地址
@@ -1546,66 +1473,61 @@
                    Cell cell7 = row.getCell(6);  //出租车资格证号
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        six = String.valueOf(cell7.getStringCellValue()).trim();
                        if(cell7.getCellType().equals(CellType.NUMERIC)){
                            six = String.valueOf(cell7.getNumericCellValue()).trim();
                        }else{
                            six = String.valueOf(cell7.getStringCellValue()).trim();
                        }
                    }

                    Cell cell8 = row.getCell(7);  //工号[选填]
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        seven = String.valueOf(cell8.getStringCellValue()).trim();
                        if(cell8.getCellType().equals(CellType.NUMERIC)){
                            seven = String.valueOf(cell8.getNumericCellValue()).trim();
                        }else{
                            seven = String.valueOf(cell8.getStringCellValue()).trim();
                        }
                    }

                    Cell cell9 = row.getCell(8);  //经营业务:专车[是/否]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        eight = String.valueOf(cell9.getStringCellValue()).trim();
                        if(cell9.getCellType().equals(CellType.NUMERIC)){
                            eight = String.valueOf(cell9.getNumericCellValue()).trim();
                        }else{
                            eight = String.valueOf(cell9.getStringCellValue()).trim();
                        }
                    }

                    Cell cell10 = row.getCell(9);  //经营业务:出租车[是/否]
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        nine = String.valueOf(cell10.getStringCellValue()).trim();
                    }

                    Cell cell11 = row.getCell(10);  //经营业务:跨城出行[是/否]
                    Cell cell11 = row.getCell(9);  //经营业务:跨城出行[是/否]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        ten = String.valueOf(cell11.getStringCellValue()).trim();
                    }

                    Cell cell12 = row.getCell(11);  //经营业务:小件同城物流[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        eleven = String.valueOf(cell12.getStringCellValue()).trim();
                    }

                    Cell cell13 = row.getCell(12);  //经营业务:小件跨城物流[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        twelve = String.valueOf(cell13.getStringCellValue()).trim();
                    }

                    Cell cell14 = row.getCell(13);  //经营业务:包车[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell14)){
                        thirteen = String.valueOf(cell14.getStringCellValue()).trim();
                    }

                    Cell cell15 = row.getCell(14);  //登录账号[手机号]
                    Cell cell15 = row.getCell(10);  //登录账号[手机号]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fourteen = String.valueOf(cell15.getStringCellValue()).trim();
                        if(cell15.getCellType().equals(CellType.NUMERIC)){
                            fourteen = String.valueOf(cell15.getNumericCellValue()).trim();
                        }else{
                            fourteen = String.valueOf(cell15.getStringCellValue()).trim();
                        }
                    }

                    Cell cell16 = row.getCell(15);  //登录密码[密码长度为6-18]
                    Cell cell16 = row.getCell(11);  //登录密码[密码长度为6-18]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        fifteen = String.valueOf(cell16.getStringCellValue()).trim();
                        if(cell16.getCellType().equals(CellType.NUMERIC)){
                            fifteen = String.valueOf(cell16.getNumericCellValue()).trim();
                        }else{
                            fifteen = String.valueOf(cell16.getStringCellValue()).trim();
                        }
                    }
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one)  || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(eight)
                            || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
                            || SinataUtil.isEmpty(ten)
                            || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) ){
                        return new ErrorTip(500, "单元格不能为空");
                    }else{
@@ -1622,25 +1544,9 @@
                        if (!eight.equals("是") && !eight.equals("否")){
                            return new ErrorTip(500, "经营业务【专车】内容不正确");
                        }
                        //判断经营业务【出租车】
                        if (!nine.equals("是") && !nine.equals("否")){
                            return new ErrorTip(500, "经营业务【出租车】内容不正确");
                        }
                        //判断经营业务【跨城出行】
                        if (!ten.equals("是") && !ten.equals("否")){
                            return new ErrorTip(500, "经营业务【跨城】内容不正确");
                        }
                        //判断经营业务【小件同城物流】
                        if (!eleven.equals("是") && !eleven.equals("否")){
                            return new ErrorTip(500, "经营业务【小件同城物流】内容不正确");
                        }
                        //判断经营业务【小件跨城物流】
                        if (!twelve.equals("是") && !twelve.equals("否")){
                            return new ErrorTip(500, "经营业务【小件跨城物流】内容不正确");
                        }
                        //判断经营业务【包车】
                        if (!thirteen.equals("是") && !thirteen.equals("否")){
                            return new ErrorTip(500, "经营业务【包车】内容不正确");
                        }
                        //判断驾龄
                        if (!isInteger(three)){
@@ -1703,39 +1609,11 @@
                            service.setType(1);
                            itDriverServiceService.insert(service);
                        }
                        //添加出租车服务模式
                        if ("是".equals(nine)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(2);
                            itDriverServiceService.insert(service);
                        }
                        //添加跨城出行服务模式
                        if ("是".equals(ten)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(3);
                            itDriverServiceService.insert(service);
                        }
                        //添加小件同城物流服务模式
                        if ("是".equals(eleven)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(4);
                            itDriverServiceService.insert(service);
                        }
                        //添加小件跨城物流服务模式
                        if ("是".equals(twelve)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(5);
                            itDriverServiceService.insert(service);
                        }
                        //添加包车服务模式
                        if ("是".equals(thirteen)){
                            TDriverService service = new TDriverService();
                            service.setDriverId(driver.getId());
                            service.setType(6);
                            itDriverServiceService.insert(service);
                        }
                    }
@@ -1978,4 +1856,19 @@
        return ResultUtil.success();
    }
    
    
    
    @ResponseBody
    @PostMapping("/getCompanyLine")
    public List<TLine> getCompanyLine(Integer companyId){
        //查询线路列表
        List<TLineCompany> lineCompanies = lineCompanyService.selectList(new EntityWrapper<TLineCompany>().eq("companyId", companyId));
        if(lineCompanies.size() > 0){
            List<Integer> collect = lineCompanies.stream().map(TLineCompany::getLineId).collect(Collectors.toList());
            return itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1).in("id", collect));
        }else{
            return new ArrayList<>();
        }
    }
    
}

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -917,6 +917,7 @@
        tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
        tOrderPrivateCar.setDriverId(driverId);
        tOrderPrivateCar.setCarId(nowDriver.getCarId());
        tOrderPrivateCar.setCompanyId(nowDriver.getCompanyId());
        itOrderPrivateCarService.updateById(tOrderPrivateCar);

        //修改专车改派订单
@@ -1001,6 +1002,7 @@
        }

        //修改订单数据
        tOrderCrossCity.setCompanyId(driver.getCompanyId());
        tOrderCrossCity.setDriverId(driverId);
        tOrderCrossCity.setCarId(driver.getCarId());
        tOrderCrossCity.setSeatNumber(seat1);
@@ -1064,6 +1066,7 @@
        //修改专车订单
        tOrderLogistics.setState(tOrderLogistics.getOldState());
        tOrderLogistics.setDriverId(driverId);
        tOrderLogistics.setCompanyId(nowDriver.getCompanyId());
        tOrderLogistics.setCarId(nowDriver.getCarId());
        orderLogisticsService.updateById(tOrderLogistics);

@@ -1123,6 +1126,7 @@
        //修改专车订单
        orderTransfer.setState(orderTransfer.getOldState());
        orderTransfer.setDriverId(driverId);
        orderTransfer.setCompanyId(nowDriver.getCompanyId());
        orderTransfer.setCarId(nowDriver.getCarId());
        orderTransferService.updateById(orderTransfer);


 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml

@@ -151,7 +151,7 @@
        when type = 6 then '包车'
        when type = 7 then '接送机'
        else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
        LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
        LEFT JOIN (SELECT ROUND(IFNULL(SUM(fraction)/COUNT(id),0),1) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
        LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
        LEFT JOIN (SELECT SUM(orderMoney) as taxiMoney,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot2 on ot2.driverId = dd.id
        LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot3 on ot3.driverId = dd.id
@@ -161,10 +161,7 @@
        LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_logistics where FIND_IN_SET(state,'6,9') GROUP BY driverId) as ot7 on ot7.driverId = dd.id
        LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_logistics where FIND_IN_SET(state,'6,9') GROUP BY driverId) as ot8 on ot8.driverId = dd.id) as o
        <where>
            o.flag != 3
            <if test="roleType != null and roleType != '' and roleType == 1">
                and FIND_IN_SET(o.authState,'2,3')
            </if>
            o.flag != 3 and FIND_IN_SET(o.authState,'2,3')
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java

@@ -1,14 +1,21 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.dao.TDriverMapper;
import com.stylefeng.guns.modular.system.model.TDriverLine;
import com.stylefeng.guns.modular.system.model.TLine;
import com.stylefeng.guns.modular.system.service.ITDriverLineService;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.service.ITLineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * <p>
@@ -20,6 +27,15 @@
 */
@Service
public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {
    
    @Autowired
    private ITDriverLineService driverLineService;
    
    @Autowired
    private ITLineService lineService;
    
    
    

    @Override
    public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
@@ -33,7 +49,19 @@

    @Override
    public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
        return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
        List<Map<String, Object>> driverList = this.baseMapper.getDriverList(page, roleType, nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
        for (Map<String, Object> map : driverList) {
            Integer id = Integer.valueOf(map.get("id").toString());
            List<TDriverLine> driverLines = driverLineService.selectList(new EntityWrapper<TDriverLine>().eq("driverId", id));
            List<Integer> collect = driverLines.stream().map(TDriverLine::getLineId).collect(Collectors.toList());
            if(collect.size() > 0){
                List<TLine> tLines = lineService.selectBatchIds(collect);
                String collect1 = tLines.stream().map(TLine::getName).collect(Collectors.joining("<br/>"));
                map.put("lineStr", collect1);
            }
    
        }
        return driverList;
    }

    @Override

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -25,12 +25,12 @@
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                            <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;display: none;">
                            <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;display: none;" onchange="changeLine()">
                                <option value="">选择所属加盟商</option>
                            </select>
                            @}else if(roleType == 2){
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;" onchange="changeLine()">
                                <option value="">选择所属加盟商</option>
                                @for(obj in franchiseeList!){
                                <option value="${obj.id}">${obj.name}</option>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html

@@ -61,12 +61,6 @@
                            @if(shiro.hasPermission("/tDriver/thaw")){
                            <#button name="解冻司机" icon="fa-remove" clickFun="YesDriver.thaw()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tDriver/training")){
                            <#button name="添加培训记录" icon="fa-remove" clickFun="YesDriver.training()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tDriver/illegal")){
                            <#button name="添加处罚记录" icon="fa-remove" clickFun="YesDriver.punish()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tDriver/import")){
                            <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="YesDriver.uploadDriverModel()" space="true"/>
                            <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html

@@ -22,11 +22,13 @@
                    </div>
                    <#avatar id="imgUrl" name="封面：" />
                    <#input id="title" name="标题"/>
                    <!--
                    <#select id="isBroadcast" name="是否播报：" >
                        <option value="">选择是否播报</option>
                        <option value="1">是</option>
                        <option value="2">否</option>
                    </#select>
                    -->
                    <div class="form-group" id="contentDiv">
                        <label class="col-sm-3 control-label">公告内容：</label>
                        <div class="col-sm-9">

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html

@@ -7,11 +7,13 @@
                <div class="col-sm-11">
                    <#avatar id="imgUrl" name="封面：" avatarImg="${item.imgUrl}"/>
                    <#input id="title" name="标题" value="${item.title}"/>
                    <!--
                    <#select id="isBroadcast" name="是否播报：" >
                    <option value="">选择是否播报</option>
                    <option value="1" ${1 == item.isBroadcast ? 'selected=selected' : ''}>是</option>
                    <option value="2" ${2 == item.isBroadcast ? 'selected=selected' : ''}>否</option>
                </#select>
                -->
                <div class="form-group" id="contentDiv">
                    <label class="col-sm-3 control-label">公告内容：</label>
                    <div class="col-sm-9">

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html

@@ -62,12 +62,12 @@
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">机场/动车站点：</label>
                        <div class="col-sm-3" >
                            <input class="form-control"  style="width: 250px;" type="text" id="address" autocomplete="on" >
<!--                            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">-->
    <!--
                        <div class="form-group">
                            <label class="col-sm-2 control-label">机场/动车站点：</label>
                            <div class="col-sm-3" >
                                <input class="form-control"  style="width: 250px;" type="text" id="address" autocomplete="on" >
                                <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">
                        </div>
                        <div class="col-sm-4" >
                            <#input id="siteName" name="站点名称" value="" />
@@ -84,7 +84,7 @@
                        </div>
                    </div>
    <div class="col-sm-10" style="margin-left: 397px;width: 70%;" >
        <!-- 创建地图容器-->

        <div id="container" style="height: 500px;" ></div>
    </div>
    <div hidden id="lon"></div>
@@ -111,7 +111,7 @@
                    </div>
                </div>
            </div>

-->
            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.addSubmit()"/>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html

@@ -78,10 +78,11 @@
                            </div>
                        </div>
                    </div>
    <!--
    <div class="form-group">
        <label class="col-sm-2 control-label">机场/动车站点：</label>
        <div class="col-sm-3" >
<!--            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">-->
            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">
            <input class="form-control"  style="width: 250px;" type="text" id="address" autocomplete="on" >
        </div>
        <div class="col-sm-4" >
@@ -99,7 +100,7 @@
        </div>
    </div>
    <div class="col-sm-10" style="margin-left: 397px;width: 70%;" >
        <!-- 创建地图容器-->

        <div id="container" style="height: 500px;" ></div>
    </div>
    <div hidden id="lon"></div>
@@ -139,6 +140,7 @@
                </table>
            </div>
        </div>
        -->
    </div>
                </div>
            </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html

@@ -21,10 +21,10 @@
<!--                                <input type="radio" id="type3" value="3" name="type" >-->
<!--                                <label for="type3"> 车载端 </label>-->
<!--                            </div>-->
                            <div class="radio radio-primary radio-inline">
                                <input type="radio" id="type4" value="4" name="type" >
                                <label for="type4"> 调度端 </label>
                            </div>
<!--                            <div class="radio radio-primary radio-inline">-->
<!--                                <input type="radio" id="type4" value="4" name="type" >-->
<!--                                <label for="type4"> 调度端 </label>-->
<!--                            </div>-->
                        </div>
                    </div>
                    <div id="androidDiv">

 ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js

@@ -183,7 +183,8 @@
            formatter: function (value, row) {
                var btn = "";
                if(row.balance != '' && row.balance != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + (row.laveActivityMoney + row.laveBusinessMoney) + '" onfocus="TUser.tooltip()">' + (row.laveActivityMoney + row.laveBusinessMoney) + '</p>']
                    var balance = ((null != row.laveActivityMoney ? row.laveActivityMoney : 0) + (null != row.laveBusinessMoney ? row.laveBusinessMoney : 0))
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + balance + '" onfocus="TUser.tooltip()">' + balance + '</p>']
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
                }

 ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js

@@ -682,10 +682,40 @@
YesDriverInfoDlg.checkBox = function(){
    var serverBox3 = $('#serverBox3').prop('checked');
    if (serverBox3){
        changeLine();
        $("#lineDiv").show();
    } else {
        $("#lineDiv").hide();
    }
}


function changeLine(){
    var companyType = $('input[name="companyType"]:checked').val();
    var companyId = null;
    if(companyType == 2){
        companyId = $('#twoId').val();
        if(null == companyId){
            companyId = $('#oneId').val();
        }
    }else{
        companyId = 1;
    }
    if(null == companyId){
        Feng.error("请选选择所属攻速");
        return;
    }
    var ajax = new $ax(Feng.ctxPath + "/tDriver/getCompanyLine", function(data){
        if(data!=null){
            var content='<option value="">选择关联线路</option>';
            $.each(data, function(k,v) {
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
            });
            $("#selectLineId").html(content);
        }
    });
    ajax.set("companyId",companyId);
    ajax.start();
}

/**
@@ -700,6 +730,7 @@
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
            });
            $("#twoId").empty().append(content);
            changeLine()
        }
    });
    ajax.set("oneId",oneId);
@@ -736,7 +767,9 @@
YesDriverInfoDlg.companyTypeClick = function (e) {
    if (1 == e){
        $(".companyDiv").hide();
        changeLine()
    } else if (2 == e){
        changeLine()
        $(".companyDiv").show();
    }
}