1、身份证校验规则调整；

2、新增司机/档案提升调整；

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/RegularUtils.java

@@ -53,8 +53,8 @@ public class RegularUtils {
     /**
      * 身份证
      */
-    public static final String IDCARD = "(^\\d{18}$)|(^\\d{15}$)";
-    /**
+    public static final String IDCARD = "[0-9A-Za-z]{15}|[0-9A-Za-z]{18}";
+    /**[0-9A-Za-z]{18}
      * 车牌号
      */
 //    public static final String TRUCK_NUMBER = "^[京津沪冀晋辽吉黑苏浙皖闽赣鲁豫鄂湘粤桂琼川黔云渝藏陕陇青宁新闽粤晋琼使领A_Z]{1}[A_Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$";
@@ -144,6 +144,6 @@ public class RegularUtils {
 
 
     public static void main(String[] args) {
-        System.out.println(matchs("\\d{1,8}([\\.]\\d{0,2})?", new BigDecimal("99999999.00").toString()));
+        System.out.println(matchs(IDCARD, "22883719241229935X"));
     }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -357,7 +357,7 @@ public class KwfDriverService {
         /**车队班组绑定**/
         driverFleetEdit(driver.getId(), params.getFleetId());
 
-        return HttpResult.ok("司机信息新增成功！", driver);
+        return HttpResult.ok(result.getMsg(), driver);
     }
 
     /**
@@ -412,7 +412,7 @@ public class KwfDriverService {
         /**车队班组绑定**/
         driverFleetEdit(driver.getId(), params.getFleetId());
 
-        return HttpResult.ok("司机信息修改成功！");
+        return HttpResult.ok(result.getMsg());
     }
 
     /**
@@ -463,14 +463,13 @@ public class KwfDriverService {
                 params.setSalt(PasswordUtils.getSaltSubPwd(password));
                 params.setPassword(password);
                 params.setEntId(LoginUserHolder.getEntId());
-                params.setEntId(params.getEntId() == null ? 1 : params.getEntId());// 暂时处理---------------zk
                 params.setBusinessStatus(Global.NO);
                 params.setStatus(Global.NO);
                 int count = driverDao.insert(params);
 
                 /**司机信息与企业关联信息**/
                 driverEntEdit(params);
-                return count > 0 ? HttpResult.ok(params) : HttpResult.error("司机信息新增失败！");
+                return count > 0 ? HttpResult.ok("司机信息新增成功！", params) : HttpResult.error("司机信息新增失败！");
             } else {
                 KwfDriver driver = drivers.get(Global.NUMERICAL_ZERO);
                 BeanUtils.copyPropertiesValue(params, driver);
@@ -481,7 +480,7 @@ public class KwfDriverService {
                 driverEnt.setEntId(LoginUserHolder.getEntId());
                 driverEnt.setId(driver.getId());
                 driverEntEdit(driverEnt);
-                return count > 0 ? HttpResult.ok(driver) : HttpResult.error("司机信息新增失败！");
+                return count > 0 ? HttpResult.ok("司机信息修改成功！", driver) : HttpResult.error("司机信息修改失败！");
             }
         } else {
             /**唯一性交易**/
@@ -494,7 +493,7 @@ public class KwfDriverService {
 
             /**更新**/
             int count = driverDao.updateById(params);
-            return count > 0 ? HttpResult.ok(params) : HttpResult.error("司机信息修改失败！");
+            return count > 0 ? HttpResult.ok("司机信息修改成功！", params) : HttpResult.error("司机信息修改失败！");
         }
     }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -340,7 +340,7 @@ public class KwfTruckService {
         /**车队班组绑定**/
         truckFleetEdit(truck.getId(), params.getFleetId());
 
-        return HttpResult.ok("车辆信息新增成功！", truck);
+        return HttpResult.ok(result.getMsg(), truck);
     }
 
     /**
@@ -452,7 +452,7 @@ public class KwfTruckService {
                 truckEnt.setEntId(LoginUserHolder.getEntId());
                 truckEnt.setId(truck.getId());
                 truckEntEdit(truckEnt);
-                return count > 0 ? HttpResult.ok(truck) : HttpResult.error("车辆信息新增失败！");
+                return count > 0 ? HttpResult.ok("车辆信息修改成功！", truck) : HttpResult.error("车辆信息修改失败！");
             }
         } else {
             /**唯一性交易**/
@@ -465,7 +465,7 @@ public class KwfTruckService {
 
             /**更新**/
             int count = truckDao.updateById(params);
-            return count > 0 ? HttpResult.ok(params) : HttpResult.error("车辆信息修改失败！");
+            return count > 0 ? HttpResult.ok("车辆信息修改成功！", params) : HttpResult.error("车辆信息修改失败！");
         }
     }