From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:21:24 +0800
Subject: [PATCH] 更新接口

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java |  228 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 163 insertions(+), 65 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index a77ced0..ca160e9 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -15,6 +15,7 @@
 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.EmailUtil;
 import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
 import com.stylefeng.guns.modular.system.util.PushURL;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -22,6 +23,9 @@
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -33,6 +37,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -73,8 +78,8 @@
     @Resource
     private DriverPunishMapper driverPunishMapper;
 
-    @Value("${pushMinistryOfTransport}")
-    private boolean pushMinistryOfTransport;
+    @Value("${spring.mail.template-path}")
+    private String templatePath;
 
 
 
@@ -585,11 +590,38 @@
                 tDriver.setAuthState(4);
             }
 
-            Map<String,String> map = new HashMap<>();
-            map.put("uid", String.valueOf(tDriver.getId()));
-            map.put("type", String.valueOf(type));
-            String result = HttpRequestUtil.postRequest(PushURL.driver_auth_url, map);
-            System.out.println("司机注册审核发送短信 :【driverId="+tDriver.getId().toString()+"】,调用接口:"+result);
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        String path = templatePath +  "driver/index.html";
+                        Document document = Jsoup.parse(new File(path), "UTF-8");
+                        document.getElementById("chinese").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("invite1").remove();
+                        document.getElementById("user1").remove();
+                        document.getElementById("settle1").remove();
+                        document.getElementById("pass1").remove();
+                        document.getElementById("email1").remove();
+                        document.getElementById("bill1").remove();
+                        document.getElementById("reward1").remove();
+                        document.getElementById("rewardToday1").remove();
+                        document.getElementById("carAudit1").remove();
+
+                        Element driver_audit1_user = document.getElementById("driver_audit1_user");
+                        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.");
+                        }else{
+                            driver_audit1_content.text("I'm sorry, your application was rejected. Reason for rejection: Incomplete filling in personal information.");
+                        }
+                        EmailUtil.send(tDriver.getEmail(), "Notice of driver registration application",  document.html());
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
 
             tDriverService.updateById(tDriver);
         }
@@ -667,6 +699,16 @@
 
         tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
 
+        String phone = tDriver.getPhone();
+        String substring = phone.substring(0, 1);
+        if("0".equals(substring)){
+            phone = "233" + phone.substring(1);
+        }
+        if(phone.indexOf("233") < 0){
+            phone = "233" + phone;
+        }
+        tDriver.setPhone(phone);
+        tDriver.setAccount(phone);
         tDriverService.insert(tDriver);
 
         //添加经营业务
@@ -790,6 +832,16 @@
             tDriver.setPassword(obj.getPassword());
         }
 
+        String phone = tDriver.getPhone();
+        String substring = phone.substring(0, 1);
+        if("0".equals(substring)){
+            phone = "233" + phone.substring(1);
+        }
+        if(phone.indexOf("233") < 0){
+            phone = "233" + phone;
+        }
+        tDriver.setPhone(phone);
+        tDriver.setAccount(phone);
         tDriverService.updateById(tDriver);
 
         //删除业务
@@ -833,7 +885,8 @@
         if (ShiroKit.getUser().getRoleType() == 1){
             title = "平台导入司机模板";
 
-            shellList.add("司机名称");
+            shellList.add("司机姓");
+            shellList.add("司机名");
             shellList.add("所属机构[平台司机/加盟司机]");
             shellList.add("所属分公司[提示:加盟司机选填]");
             shellList.add("所属加盟商[提示:加盟司机选填]");
@@ -855,7 +908,8 @@
         }else if (ShiroKit.getUser().getRoleType() == 2){
             title = "分公司导入司机模板";
 
-            shellList.add("司机名称");
+            shellList.add("司机姓");
+            shellList.add("司机名");
             shellList.add("所属加盟商[选填]");
             shellList.add("性别[男/女]");
             shellList.add("驾驶证号码");
@@ -875,7 +929,8 @@
         }else if (ShiroKit.getUser().getRoleType() == 3){
             title = "加盟商导入司机模板";
 
-            shellList.add("司机名称");
+            shellList.add("司机姓");
+            shellList.add("司机名");
             shellList.add("性别[男/女]");
             shellList.add("驾驶证号码");
             shellList.add("驾龄");
@@ -925,115 +980,128 @@
                         zero = String.valueOf(cell0.getStringCellValue()).trim();
                     }
 
-                    Cell cell1 = row.getCell(1);  //所属机构[平台司机/加盟司机]
+                    Cell cell01 = row.getCell(1);  //司机名称
+                    String zero1 = null;
+                    if (SinataUtil.isNotEmpty(cell01)){
+                        zero1 = String.valueOf(cell01.getStringCellValue()).trim();
+                    }
+
+                    Cell cell1 = row.getCell(2);  //所属机构[平台司机/加盟司机]
                     String one = null;
                     if (SinataUtil.isNotEmpty(cell1)){
                         one = String.valueOf(cell1.getStringCellValue()).trim();
                     }
 
-                    Cell cell2 = row.getCell(2);  //所属分公司[提示:加盟司机选填]
+                    Cell cell2 = row.getCell(3);  //所属分公司[提示:加盟司机选填]
                     String two = null;
                     if (SinataUtil.isNotEmpty(cell2)){
                         two = String.valueOf(cell2.getStringCellValue()).trim();
                     }
 
-                    Cell cell3 = row.getCell(3);  //所属加盟商[提示:加盟司机选填]
+                    Cell cell3 = row.getCell(4);  //所属加盟商[提示:加盟司机选填]
                     String three = null;
                     if (SinataUtil.isNotEmpty(cell3)){
                         three = String.valueOf(cell3.getStringCellValue()).trim();
                     }
 
-                    Cell cell4 = row.getCell(4);  //性别[男/女]
+                    Cell cell4 = row.getCell(5);  //性别[男/女]
                     String four = null;
                     if (SinataUtil.isNotEmpty(cell4)){
                         four = String.valueOf(cell4.getStringCellValue()).trim();
                     }
 
-                    Cell cell5 = row.getCell(5);  //驾驶证号码
+                    Cell cell5 = row.getCell(6);  //驾驶证号码
                     String five = null;
                     if (SinataUtil.isNotEmpty(cell5)){
                         five = String.valueOf(cell5.getStringCellValue()).trim();
                     }
 
-                    Cell cell6 = row.getCell(6);  //驾龄
+                    Cell cell6 = row.getCell(7);  //驾龄
                     String six = null;
                     if (SinataUtil.isNotEmpty(cell6)){
                         six = String.valueOf(cell6.getStringCellValue()).trim();
                     }
 
-                    Cell cell7 = row.getCell(7);  //身份证号
+                    Cell cell7 = row.getCell(8);  //身份证号
                     String seven = null;
                     if (SinataUtil.isNotEmpty(cell7)){
                         seven = String.valueOf(cell7.getStringCellValue()).trim();
                     }
 
-                    Cell cell8 = row.getCell(8);  //居住地址
+                    Cell cell8 = row.getCell(9);  //居住地址
                     String eight = null;
                     if (SinataUtil.isNotEmpty(cell8)){
                         eight = String.valueOf(cell8.getStringCellValue()).trim();
                     }
 
-                    Cell cell9 = row.getCell(9);  //出租车资格证号
+                    Cell cell9 = row.getCell(10);  //出租车资格证号
                     String nine = null;
                     if (SinataUtil.isNotEmpty(cell9)){
                         nine = String.valueOf(cell9.getStringCellValue()).trim();
                     }
 
-                    Cell cell10 = row.getCell(10);  //工号[选填]
+                    Cell cell10 = row.getCell(11);  //工号[选填]
                     String ten = null;
                     if (SinataUtil.isNotEmpty(cell10)){
                         ten = String.valueOf(cell10.getStringCellValue()).trim();
                     }
 
-                    Cell cell11 = row.getCell(11);  //经营业务:专车[是/否]
+                    Cell cell11 = row.getCell(12);  //经营业务:专车[是/否]
                     String eleven = null;
                     if (SinataUtil.isNotEmpty(cell11)){
                         eleven = String.valueOf(cell11.getStringCellValue()).trim();
                     }
 
-                    Cell cell12 = row.getCell(12);  //经营业务:专车[是/否]
+                    Cell cell12 = row.getCell(13);  //经营业务:专车[是/否]
                     String twelve = null;
                     if (SinataUtil.isNotEmpty(cell12)){
                         twelve = String.valueOf(cell12.getStringCellValue()).trim();
                     }
 
-                    Cell cell13 = row.getCell(13);  //经营业务:跨城出行[是/否]
+                    Cell cell13 = row.getCell(14);  //经营业务:跨城出行[是/否]
                     String thirteen = null;
                     if (SinataUtil.isNotEmpty(cell13)){
                         thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                     }
 
-                    Cell cell14 = row.getCell(14);  //经营业务:小件同城物流[是/否]
+                    Cell cell14 = row.getCell(15);  //经营业务:小件同城物流[是/否]
                     String fourteen = null;
                     if (SinataUtil.isNotEmpty(cell14)){
                         fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                     }
 
-                    Cell cell15 = row.getCell(15);  //经营业务:小件跨城物流[是/否]
+                    Cell cell15 = row.getCell(16);  //经营业务:小件跨城物流[是/否]
                     String fifteen = null;
                     if (SinataUtil.isNotEmpty(cell15)){
                         fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                     }
 
-                    Cell cell16 = row.getCell(16);  //经营业务:包车[是/否]
+                    Cell cell16 = row.getCell(17);  //经营业务:包车[是/否]
                     String sixteen = null;
                     if (SinataUtil.isNotEmpty(cell16)){
                         sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                     }
 
-                    Cell cell17 = row.getCell(17);  //登录账号[手机号]
+                    Cell cell17 = row.getCell(18);  //登录账号[手机号]
                     String seventeen = null;
                     if (SinataUtil.isNotEmpty(cell17)){
                         seventeen = String.valueOf(cell17.getStringCellValue()).trim();
+                        String substring = seventeen.substring(0, 1);
+                        if("0".equals(substring)){
+                            seventeen = "233" + seventeen.substring(1);
+                        }
+                        if(seventeen.indexOf("233") < 0){
+                            seventeen = "233" + seventeen;
+                        }
                     }
 
-                    Cell cell18 = row.getCell(18);  //登录密码[密码长度为6-18]
+                    Cell cell18 = row.getCell(19);  //登录密码[密码长度为6-18]
                     String eighteen = null;
                     if (SinataUtil.isNotEmpty(cell18)){
                         eighteen = String.valueOf(cell18.getStringCellValue()).trim();
                     }
 
-                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
+                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(zero1) || 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)
@@ -1116,7 +1184,8 @@
                         driver.setJobNumber(ten);
                         driver.setPhone(seventeen);
                         driver.setPassword(ShiroKit.md5(eighteen, "SA;d5#"));
-                        driver.setName(zero);
+                        driver.setLastName(zero);
+                        driver.setFirstName(zero1);
                         if ("男".equals(four)){
                             driver.setSex(1);
                         }else if ("女".equals(four)){
@@ -1202,102 +1271,116 @@
                         zero = String.valueOf(cell0.getStringCellValue()).trim();
                     }
 
-                    Cell cell1 = row.getCell(1);  //所属加盟商[选填]
+                    Cell cell01 = row.getCell(1);  //司机名称
+                    String zero1 = null;
+                    if (SinataUtil.isNotEmpty(cell01)){
+                        zero1 = String.valueOf(cell01.getStringCellValue()).trim();
+                    }
+
+                    Cell cell1 = row.getCell(2);  //所属加盟商[选填]
                     String one = null;
                     if (SinataUtil.isNotEmpty(cell1)){
                         one = String.valueOf(cell1.getStringCellValue()).trim();
                     }
 
-                    Cell cell2 = row.getCell(2);  //性别[男/女]
+                    Cell cell2 = row.getCell(3);  //性别[男/女]
                     String two = null;
                     if (SinataUtil.isNotEmpty(cell2)){
                         two = String.valueOf(cell2.getStringCellValue()).trim();
                     }
 
-                    Cell cell3 = row.getCell(3);  //驾驶证号码
+                    Cell cell3 = row.getCell(4);  //驾驶证号码
                     String three = null;
                     if (SinataUtil.isNotEmpty(cell3)){
                         three = String.valueOf(cell3.getStringCellValue()).trim();
                     }
 
-                    Cell cell4 = row.getCell(4);  //驾龄
+                    Cell cell4 = row.getCell(5);  //驾龄
                     String four = null;
                     if (SinataUtil.isNotEmpty(cell4)){
                         four = String.valueOf(cell4.getStringCellValue()).trim();
                     }
 
-                    Cell cell5 = row.getCell(5);  //身份证号
+                    Cell cell5 = row.getCell(6);  //身份证号
                     String five = null;
                     if (SinataUtil.isNotEmpty(cell5)){
                         five = String.valueOf(cell5.getStringCellValue()).trim();
                     }
 
-                    Cell cell6 = row.getCell(6);  //居住地址
+                    Cell cell6 = row.getCell(7);  //居住地址
                     String six = null;
                     if (SinataUtil.isNotEmpty(cell6)){
                         six = String.valueOf(cell6.getStringCellValue()).trim();
                     }
 
-                    Cell cell7 = row.getCell(7);  //出租车资格证号
+                    Cell cell7 = row.getCell(8);  //出租车资格证号
                     String seven = null;
                     if (SinataUtil.isNotEmpty(cell7)){
                         seven = String.valueOf(cell7.getStringCellValue()).trim();
                     }
 
-                    Cell cell8 = row.getCell(8);  //工号[选填]
+                    Cell cell8 = row.getCell(9);  //工号[选填]
                     String eight = null;
                     if (SinataUtil.isNotEmpty(cell8)){
                         eight = String.valueOf(cell8.getStringCellValue()).trim();
                     }
 
-                    Cell cell9 = row.getCell(9);  //经营业务:专车[是/否]
+                    Cell cell9 = row.getCell(10);  //经营业务:专车[是/否]
                     String nine = null;
                     if (SinataUtil.isNotEmpty(cell9)){
                         nine = String.valueOf(cell9.getStringCellValue()).trim();
                     }
 
-                    Cell cell10 = row.getCell(10);  //经营业务:出租车[是/否]
+                    Cell cell10 = row.getCell(11);  //经营业务:出租车[是/否]
                     String ten = null;
                     if (SinataUtil.isNotEmpty(cell10)){
                         ten = String.valueOf(cell10.getStringCellValue()).trim();
                     }
 
-                    Cell cell11 = row.getCell(11);  //经营业务:跨城出行[是/否]
+                    Cell cell11 = row.getCell(12);  //经营业务:跨城出行[是/否]
                     String eleven = null;
                     if (SinataUtil.isNotEmpty(cell11)){
                         eleven = String.valueOf(cell11.getStringCellValue()).trim();
                     }
 
-                    Cell cell12 = row.getCell(12);  //经营业务:小件同城物流[是/否]
+                    Cell cell12 = row.getCell(13);  //经营业务:小件同城物流[是/否]
                     String twelve = null;
                     if (SinataUtil.isNotEmpty(cell12)){
                         twelve = String.valueOf(cell12.getStringCellValue()).trim();
                     }
 
-                    Cell cell13 = row.getCell(13);  //经营业务:小件跨城物流[是/否]
+                    Cell cell13 = row.getCell(14);  //经营业务:小件跨城物流[是/否]
                     String thirteen = null;
                     if (SinataUtil.isNotEmpty(cell13)){
                         thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                     }
 
-                    Cell cell14 = row.getCell(14);  //经营业务:包车[是/否]
+                    Cell cell14 = row.getCell(15);  //经营业务:包车[是/否]
                     String fourteen = null;
                     if (SinataUtil.isNotEmpty(cell14)){
                         fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                     }
 
-                    Cell cell15 = row.getCell(15);  //登录账号[手机号]
+                    Cell cell15 = row.getCell(16);  //登录账号[手机号]
                     String fifteen = null;
                     if (SinataUtil.isNotEmpty(cell15)){
                         fifteen = String.valueOf(cell15.getStringCellValue()).trim();
+
+                        String substring = fifteen.substring(0, 1);
+                        if("0".equals(substring)){
+                            fifteen = "233" + fifteen.substring(1);
+                        }
+                        if(fifteen.indexOf("233") < 0){
+                            fifteen = "233" + fifteen;
+                        }
                     }
 
-                    Cell cell16 = row.getCell(16);  //登录密码[密码长度为6-18]
+                    Cell cell16 = row.getCell(17);  //登录密码[密码长度为6-18]
                     String sixteen = null;
                     if (SinataUtil.isNotEmpty(cell16)){
                         sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                     }
-                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
+                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(zero1) || 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)
@@ -1365,7 +1448,8 @@
                         driver.setJobNumber(eight);
                         driver.setPhone(fifteen);
                         driver.setPassword(ShiroKit.md5(sixteen, "SA;d5#"));
-                        driver.setName(zero);
+                        driver.setLastName(zero);
+                        driver.setFirstName(zero1);
                         if ("男".equals(two)){
                             driver.setSex(1);
                         }else if ("女".equals(two)){
@@ -1447,96 +1531,109 @@
                         zero = String.valueOf(cell0.getStringCellValue()).trim();
                     }
 
-                    Cell cell2 = row.getCell(1);  //性别[男/女]
+                    Cell cell01 = row.getCell(1);  //司机名称
+                    String zero1 = null;
+                    if (SinataUtil.isNotEmpty(cell01)){
+                        zero1 = String.valueOf(cell01.getStringCellValue()).trim();
+                    }
+
+                    Cell cell2 = row.getCell(2);  //性别[男/女]
                     String one = null;
                     if (SinataUtil.isNotEmpty(cell2)){
                         one = String.valueOf(cell2.getStringCellValue()).trim();
                     }
 
-                    Cell cell3 = row.getCell(2);  //驾驶证号码
+                    Cell cell3 = row.getCell(3);  //驾驶证号码
                     String two = null;
                     if (SinataUtil.isNotEmpty(cell3)){
                         two = String.valueOf(cell3.getStringCellValue()).trim();
                     }
 
-                    Cell cell4 = row.getCell(3);  //驾龄
+                    Cell cell4 = row.getCell(4);  //驾龄
                     String three = null;
                     if (SinataUtil.isNotEmpty(cell4)){
                         three = String.valueOf(cell4.getStringCellValue()).trim();
                     }
 
-                    Cell cell5 = row.getCell(4);  //身份证号
+                    Cell cell5 = row.getCell(5);  //身份证号
                     String four = null;
                     if (SinataUtil.isNotEmpty(cell5)){
                         four = String.valueOf(cell5.getStringCellValue()).trim();
                     }
 
-                    Cell cell6 = row.getCell(5);  //居住地址
+                    Cell cell6 = row.getCell(6);  //居住地址
                     String five = null;
                     if (SinataUtil.isNotEmpty(cell6)){
                         five = String.valueOf(cell6.getStringCellValue()).trim();
                     }
 
-                    Cell cell7 = row.getCell(6);  //出租车资格证号
+                    Cell cell7 = row.getCell(7);  //出租车资格证号
                     String six = null;
                     if (SinataUtil.isNotEmpty(cell7)){
                         six = String.valueOf(cell7.getStringCellValue()).trim();
                     }
 
-                    Cell cell8 = row.getCell(7);  //工号[选填]
+                    Cell cell8 = row.getCell(8);  //工号[选填]
                     String seven = null;
                     if (SinataUtil.isNotEmpty(cell8)){
                         seven = String.valueOf(cell8.getStringCellValue()).trim();
                     }
 
-                    Cell cell9 = row.getCell(8);  //经营业务:专车[是/否]
+                    Cell cell9 = row.getCell(9);  //经营业务:专车[是/否]
                     String eight = null;
                     if (SinataUtil.isNotEmpty(cell9)){
                         eight = String.valueOf(cell9.getStringCellValue()).trim();
                     }
 
-                    Cell cell10 = row.getCell(9);  //经营业务:出租车[是/否]
+                    Cell cell10 = row.getCell(10);  //经营业务:出租车[是/否]
                     String nine = null;
                     if (SinataUtil.isNotEmpty(cell10)){
                         nine = String.valueOf(cell10.getStringCellValue()).trim();
                     }
 
-                    Cell cell11 = row.getCell(10);  //经营业务:跨城出行[是/否]
+                    Cell cell11 = row.getCell(11);  //经营业务:跨城出行[是/否]
                     String ten = null;
                     if (SinataUtil.isNotEmpty(cell11)){
                         ten = String.valueOf(cell11.getStringCellValue()).trim();
                     }
 
-                    Cell cell12 = row.getCell(11);  //经营业务:小件同城物流[是/否]
+                    Cell cell12 = row.getCell(12);  //经营业务:小件同城物流[是/否]
                     String eleven = null;
                     if (SinataUtil.isNotEmpty(cell12)){
                         eleven = String.valueOf(cell12.getStringCellValue()).trim();
                     }
 
-                    Cell cell13 = row.getCell(12);  //经营业务:小件跨城物流[是/否]
+                    Cell cell13 = row.getCell(13);  //经营业务:小件跨城物流[是/否]
                     String twelve = null;
                     if (SinataUtil.isNotEmpty(cell13)){
                         twelve = String.valueOf(cell13.getStringCellValue()).trim();
                     }
 
-                    Cell cell14 = row.getCell(13);  //经营业务:包车[是/否]
+                    Cell cell14 = row.getCell(14);  //经营业务:包车[是/否]
                     String thirteen = null;
                     if (SinataUtil.isNotEmpty(cell14)){
                         thirteen = String.valueOf(cell14.getStringCellValue()).trim();
                     }
 
-                    Cell cell15 = row.getCell(14);  //登录账号[手机号]
+                    Cell cell15 = row.getCell(15);  //登录账号[手机号]
                     String fourteen = null;
                     if (SinataUtil.isNotEmpty(cell15)){
                         fourteen = String.valueOf(cell15.getStringCellValue()).trim();
+                        String substring = fourteen.substring(0, 1);
+                        if("0".equals(substring)){
+                            fourteen = "233" + fourteen.substring(1);
+                        }
+                        if(fourteen.indexOf("233") < 0){
+                            fourteen = "233" + fourteen;
+                        }
                     }
 
-                    Cell cell16 = row.getCell(15);  //登录密码[密码长度为6-18]
+                    Cell cell16 = row.getCell(16);  //登录密码[密码长度为6-18]
                     String fifteen = null;
                     if (SinataUtil.isNotEmpty(cell16)){
                         fifteen = String.valueOf(cell16.getStringCellValue()).trim();
                     }
-                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one)  || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
+                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(zero1) || 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)
@@ -1605,7 +1702,8 @@
                         driver.setJobNumber(seven);
                         driver.setPhone(fourteen);
                         driver.setPassword(ShiroKit.md5(fifteen, "SA;d5#"));
-                        driver.setName(zero);
+                        driver.setLastName(zero);
+                        driver.setFirstName(zero1);
                         if ("男".equals(one)){
                             driver.setSex(1);
                         }else if ("女".equals(one)){

--
Gitblit v1.7.1