1、新增车队班组相关接口

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

@@ -149,12 +149,12 @@ public class CollectionUtils extends CollectionUtil {
     }
 
     /**
-          * 按照List<Map<String,Object>>里面map的某个value重新封装成多个不同的list, 原始数据类型List<Map
-          * <String,Object>>, 转换后数据类型Map<String,List<Map<String,Object>>>
-          * @param list
-          * @param oneMapKey
-          * @return
-          */
+     * 按照List<Map<String,Object>>里面map的某个value重新封装成多个不同的list, 原始数据类型List<Map
+     * <String,Object>>, 转换后数据类型Map<String,List<Map<String,Object>>>
+     * @param list
+     * @param oneMapKey
+     * @return
+     */
     public static Map<String, Object> change(List<Map<String, Object>> list, String oneMapKey) {
 	  Map<String, Object> resultMap = CollectionUtils.createHashMap();
 	  Set<Object> setTmp = new HashSet<Object>();
@@ -177,17 +177,17 @@ public class CollectionUtils extends CollectionUtil {
     }
 
     /**
-          * 按照List<Map<String,Object>>里面map的某个value重新封装成多个不同的list, 原始数据类型List<Map
-          * <String,Object>>, 转换后数据类型Map<String,List<Map<String,Object>>>
-          * @param list
-          * @param oneMapKey
-          * @return
-          */
-    public static List<Map<String, Object>> change2(List<Map<String, Object>> inList, String oneMapKey,
+     * 按照List<Map<String,Object>>里面map的某个value重新封装成多个不同的list, 原始数据类型List<Map
+     * <String,Object>>, 转换后数据类型Map<String,List<Map<String,Object>>>
+     * @param list
+     * @param oneMapKey
+     * @return
+     */
+    public static List<Map<String, Object>> change2(List<Map<String, Object>> list, String oneMapKey,
 								    List<Map<String, Object>> outList) {
 	  // 1.将某个key的值存在set中
 	  Set<Object> setTmp = new HashSet<Object>();
-	  for (Map<String, Object> tmp : inList) {
+	  for (Map<String, Object> tmp : list) {
 		setTmp.add(tmp.get(oneMapKey));
 	  }
 	  // 2.遍历set
@@ -198,7 +198,7 @@ public class CollectionUtils extends CollectionUtil {
 		Map<String, Object> oneSetTmpMap = CollectionUtils.createHashMap();
 		List<Map<String, Object>> oneSetTmpList = new ArrayList<Map<String, Object>>();
 
-		for (Map<String, Object> tmp : inList) {
+		for (Map<String, Object> tmp : list) {
 		    oneMapValueStr = (String) tmp.get(oneMapKey);
 		    if (oneSetTmpStr.equals(oneMapValueStr)) {
 			  oneSetTmpMap.put("key", oneSetTmpStr);
@@ -214,7 +214,7 @@ public class CollectionUtils extends CollectionUtil {
 	/**
 	 * 开始分页
 	 * @param list
-	 * @param pageNum 页码
+	 * @param page 页码
 	 * @param pageSize 每页多少条数据
 	 * @return
 	 */
@@ -260,6 +260,50 @@ public class CollectionUtils extends CollectionUtil {
 		return treeSet;
 	}
 
+	/**
+	 * 获取list中对象key值为value的对象
+	 * @param list 数据集
+	 * @param key key
+	 * @param value 匹配值
+	 * @return
+	 */
+	public List<Map<String, Object>> listByKeyValue(List<Map<String, Object>> list, String key, String value) {
+		if (CollectionUtils.isEmpty(list)) {
+			return null;
+		}
+		List<Map<String, Object>> outList = new ArrayList();
+		for (Map<String, Object> map:list) {
+			Object str = map.get(key);
+			if (StringUtils.isNotBlank(str) && StringUtils.objectStr(str).equals(value)) {
+				outList.add(map);
+			}
+		}
+
+		return outList;
+	}
+
+	/**
+	 * 校验list中对象key值是否存在与value不一致的情况
+	 * @param list 数据集
+	 * @param key key
+	 * @param value 匹配值
+	 * @return
+	 */
+	public static boolean listByKeyValueV1(List<Map<String, Object>> list, String key, String value) {
+		if (CollectionUtils.isEmpty(list)) {
+			return false;
+		}
+		for (Map<String, Object> map:list) {
+			Object str = map.get(key);
+			if (StringUtils.isNotBlank(str) && !StringUtils.objectStr(str).equals(value)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
     public static void main(String[] args) {
 	  Map<String, Object> map1 = CollectionUtils.createHashMap();
 	  Map<String, Object> map2 = CollectionUtils.createHashMap();
@@ -313,6 +357,7 @@ public class CollectionUtils extends CollectionUtil {
 	  outList = change2(inList, "name", outList);
 	  System.out.println("retList==2==:" + JSONObject.toJSONString(outList));
     }
+
     /**
      * @desc: object转list
      * @author: yzc

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

@@ -1,74 +0,0 @@
-package com.sckw.core.utils;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * @author xcq
- * @date 2022年06月14日 13:41
- */
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
-public class R<T> implements Serializable {
-    @Serial
-    private static final long serialVersionUID = 1L;
-    /**
-     * 200-成功 102-失败
-     */
-    @Getter
-    @Setter
-    private int code;
-
-    @Getter
-    @Setter
-    private String msg;
-
-    @Getter
-    @Setter
-    private T data;
-
-    public static <T> R<T> ok() {
-        return restResult(null, 200, null);
-    }
-
-    public static <T> R<T> ok(T data) {
-        return restResult(data, 200, null);
-    }
-
-    public static <T> R<T> ok(T data, String msg) {
-        return restResult(data, 200, msg);
-    }
-
-    public static <T> R<T> failed() {
-        return restResult(null, 102, null);
-    }
-
-    public static <T> R<T> failed(String msg) {
-        return restResult(null, 102, msg);
-    }
-
-    public static <T> R<T> failed(T data) {
-        return restResult(data, 102, null);
-    }
-
-    public static <T> R<T> failed(T data, String msg) {
-        return restResult(data, 102, msg);
-    }
-
-    public static <T> R<T> failed(T data, String msg, int code) {
-        return restResult(data, code, msg);
-    }
-
-    private static <T> R<T> restResult(T data, int code, String msg) {
-        R<T> apiResult = new R<>();
-        apiResult.setCode(code);
-        apiResult.setData(data);
-        apiResult.setMsg(msg);
-        return apiResult;
-    }
-}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -0,0 +1,89 @@
+package com.sckw.fleet.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
+import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.model.KwfDriver;
+import com.sckw.fleet.service.KwfDriverService;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @desc 司机
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@RestController
+@RequestMapping("/kwfDriver")
+public class KwfDriverController {
+
+    @Autowired
+    KwfDriverService driverService;
+
+    /**
+     * @param id 主键ID
+     * @desc 根据主键查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    @GetMapping("/detail")
+    public HttpResult selectByKey(Long id) throws SystemException {
+        return HttpResult.ok(driverService.selectByKey(id));
+    }
+
+    /**
+     * @param params {page：页数、pageSize：每页条数、。。。}
+     * @desc 分页查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    @PostMapping("/select")
+    public HttpResult findPage(@RequestBody HashMap params) throws SystemException {
+        // 设置分页参数
+        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
+        List<KwfDriver> list = driverService.findPage(params);
+        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
+        return HttpResult.ok(pageResult);
+    }
+
+    /**
+     * @param params {。。。}
+     * @desc 查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    @PostMapping("/findList")
+    public HttpResult findList(@RequestBody HashMap params) throws SystemException {
+        return HttpResult.ok(driverService.findList(params));
+    }
+
+    /**
+     * @param params 新增参数
+     * @return HttpResult
+     * @desc 新增用户
+     * @author czh
+     * @date 2023/6/14
+     */
+    @PostMapping("/add")
+    public HttpResult add(@Valid @RequestBody KwfDriver params) {
+        return driverService.add(params);
+    }
+
+    /**
+     * @param params {}
+     * @description 更新
+     * @author zk
+     * @date 2023/5/30
+     **/
+    @PostMapping("/update")
+    public HttpResult update(@RequestBody KwfDriver params) throws SystemException {
+        return driverService.update(params);
+    }
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfFleetController.java

@@ -0,0 +1,90 @@
+package com.sckw.fleet.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.model.KwfDriver;
+import com.sckw.fleet.model.KwfFleet;
+import com.sckw.fleet.model.dto.KwfFleetDto;
+import com.sckw.fleet.service.KwfFleetService;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author zk
+ * @desc 车队
+ * @date 2023/7/6 0006
+ */
+@RestController
+@RequestMapping("/kwfFleet")
+public class KwfFleetController {
+
+    @Autowired
+    KwfFleetService fleetService;
+
+    /**
+     * @param id 主键ID
+     * @desc 根据主键查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    @GetMapping("/detail")
+    public HttpResult selectByKey(Long id) throws SystemException {
+        return HttpResult.ok(fleetService.selectByKey(id));
+    }
+
+    /**
+     * @param params {page：页数、pageSize：每页条数、。。。}
+     * @desc 分页查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    @PostMapping("/select")
+    public HttpResult findPage(@RequestBody HashMap params) throws SystemException {
+        // 设置分页参数
+        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
+        List<KwfFleet> list = fleetService.findPage(params);
+        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
+        return HttpResult.ok(pageResult);
+    }
+
+    /**
+     * @param params {。。。}
+     * @desc 查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    @PostMapping("/findList")
+    public HttpResult findList(@RequestBody HashMap params) throws SystemException {
+        return HttpResult.ok(fleetService.findList(params));
+    }
+
+    /**
+     * @param params 新增参数
+     * @return HttpResult
+     * @desc 新增用户
+     * @author czh
+     * @date 2023/6/14
+     */
+    @PostMapping("/add")
+    public HttpResult add(@Valid @RequestBody KwfFleetDto params) {
+        return fleetService.add(params);
+    }
+
+    /**
+     * @param params {}
+     * @description 更新
+     * @author zk
+     * @date 2023/5/30
+     **/
+    @PostMapping("/update")
+    public HttpResult update(@Valid @RequestBody KwfFleetDto params) throws SystemException {
+        return fleetService.update(params);
+    }
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -0,0 +1,14 @@
+package com.sckw.fleet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zk
+ * @desc 车辆
+ * @date 2023/7/6 0006
+ */
+@RestController
+@RequestMapping("/kwfTruck")
+public class KwfTruckController {
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverCardMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfDriverCard;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机身份证信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfDriverCardMapper extends BaseMapper<KwfDriverCard> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverEntMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfDriverEnt;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机信息与企业关联信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfDriverEntMapper extends BaseMapper<KwfDriverEnt> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverImportMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfDriverImport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机信息导入记录 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfDriverImportMapper extends BaseMapper<KwfDriverImport> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverLicenseMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfDriverLicense;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机驾驶证信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfDriverLicenseMapper extends BaseMapper<KwfDriverLicense> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfDriver;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfDriverMapper extends BaseMapper<KwfDriver> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverQualificationMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfDriverQualification;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机从业资格证 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfDriverQualificationMapper extends BaseMapper<KwfDriverQualification> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetDriverMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfFleetDriver;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车队-司机 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfFleetDriverMapper extends BaseMapper<KwfFleetDriver> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetMapper.java

@@ -0,0 +1,32 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfFleet;
+import com.sckw.fleet.model.vo.KwfFleetVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @desc 车队 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfFleetMapper extends BaseMapper<KwfFleet> {
+
+    /**
+     * 分页查询
+     * @param params
+     * @return
+     */
+    List<KwfFleetVo> findPage(Map<String, Object> params);
+
+    /**
+     * 查询
+     * @param params
+     * @return
+     */
+    List<Map<String, Object>> findList(Map<String, Object> params);
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetTruckMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfFleetTruck;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车队-车辆 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfFleetTruckMapper extends BaseMapper<KwfFleetTruck> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTransportLicenseMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTransportLicense;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车辆道路运输许可证 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTransportLicenseMapper extends BaseMapper<KwfTransportLicense> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckEntMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTruckEnt;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车辆信息与企业关联信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTruckEntMapper extends BaseMapper<KwfTruckEnt> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckImportMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTruckImport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机信息信息导入记录 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTruckImportMapper extends BaseMapper<KwfTruckImport> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckLicenseMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTruckLicense;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车辆行驶证信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTruckLicenseMapper extends BaseMapper<KwfTruckLicense> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTruck;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车辆信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTruckMapper extends BaseMapper<KwfTruck> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckReportImportMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTruckReportImport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车辆上报导入记录 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTruckReportImportMapper extends BaseMapper<KwfTruckReportImport> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckReportMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.fleet.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.fleet.model.KwfTruckReport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 车辆上报 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwfTruckReportMapper extends BaseMapper<KwfTruckReport> {
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriver.java

@@ -0,0 +1,64 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+
+/**
+ * @desc 司机
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfDriver extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 司机姓名
+     */
+    private String name;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 盐
+     */
+    private String salt;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 身份证号
+     */
+    private String idcard;
+
+    /**
+     * 总运单完成量
+     */
+    private Integer totalComplete;
+
+    /**
+     * 总运单接单量
+     */
+    private Integer totalTake;
+
+    /**
+     * 总运量（净重）
+     */
+    private BigDecimal totalWeight;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverCard.java

@@ -0,0 +1,49 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @desc 司机身份证信息
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfDriverCard extends BaseModel {
+
+    /**
+     * 司机id
+     */
+    private Long driverId;
+
+    /**
+     * 身份证号
+     */
+    private String idcard;
+
+    /**
+     * 有效日期
+     */
+    private Date expireTime;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 证书正面URL地址
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面URL地址
+     */
+    private String certificateRevolt;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverEnt.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 司机信息与企业关联信息
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfDriverEnt extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 司机ID
+     */
+    private Long driverId;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverImport.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 司机信息导入记录
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfDriverImport extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 导入文件oss地址
+     */
+    private String url;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverLicense.java

@@ -0,0 +1,54 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @desc 司机驾驶证信息
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfDriverLicense extends BaseModel {
+
+    /**
+     * 司机id
+     */
+    private Long driverId;
+
+    /**
+     * 驾驶证号
+     */
+    private String driverNo;
+
+    /**
+     * 准驾车型
+     */
+    private String type;
+
+    /**
+     * 有效日期
+     */
+    private Date expireTime;
+
+    /**
+     * 发证机关单位
+     */
+    private String grantUnit;
+
+    /**
+     * 证书正面URL地址
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面URL地址
+     */
+    private String certificateRevolt;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriverQualification.java

@@ -0,0 +1,54 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @desc 司机从业资格证
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfDriverQualification extends BaseModel {
+
+    /**
+     * 司机id
+     */
+    private Long driverId;
+
+    /**
+     * 从业资格证号
+     */
+    private String qualiNo;
+
+    /**
+     * 准驾车型
+     */
+    private String type;
+
+    /**
+     * 有效日期
+     */
+    private Date expireTime;
+
+    /**
+     * 发证机关单位
+     */
+    private String grantUnit;
+
+    /**
+     * 证书正面URL地址
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面URL地址
+     */
+    private String certificateRevolt;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfFleet.java

@@ -0,0 +1,37 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 车队
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfFleet extends BaseModel {
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 车队名称
+     */
+    private String name;
+
+    /**
+     * 车队联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfFleetDriver.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 车队-司机
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfFleetDriver extends BaseModel {
+
+    /**
+     * 车队id
+     */
+    private Long fleetId;
+
+    /**
+     * 车队名称
+     */
+    private Long driverId;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfFleetTruck.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 车队-车辆
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfFleetTruck extends BaseModel {
+
+    /**
+     * 车队id
+     */
+    private Long fleetId;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTransportLicense.java

@@ -0,0 +1,64 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @desc 车辆道路运输许可证
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTransportLicense extends BaseModel {
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 道路运输证号
+     */
+    private String roadTranNo;
+
+    /**
+     * 企业名称
+     */
+    private String firmName;
+
+    /**
+     * 经营许可证号
+     */
+    private String businessLicenseNo;
+
+    /**
+     * 发证机关单位
+     */
+    private String grantUnit;
+
+    /**
+     * 发证日期
+     */
+    private Date grantTime;
+
+    /**
+     * 有效期至
+     */
+    private Date expireTime;
+
+    /**
+     * 证书正面URL地址
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面URL地址
+     */
+    private String certificateRevolt;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruck.java

@@ -0,0 +1,99 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+
+/**
+ * @desc 车辆信息
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTruck extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 车辆类型（牵引车、自卸、高栏、平板、厢式、集装箱车、罐车、封闭式、专项作业车、其他）
+     */
+    private Integer type;
+
+    /**
+     * 能源类型（柴油、汽油、电动、氢能、天然气、液化石油气、甲醇、油电混动、油气混动、其他）
+     */
+    private Integer energyType;
+
+    /**
+     * 使用性质(营运车、租赁车辆、货运车、危化品运输车、非营运车、其他)
+     */
+    private Integer useType;
+
+    /**
+     * 外廓尺寸
+     */
+    private String spec;
+
+    /**
+     * 标准荷载（净重）
+     */
+    private BigDecimal actualWeight;
+
+    /**
+     * 车辆总质量(毛重)
+     */
+    private BigDecimal grossWeight;
+
+    /**
+     * 皮重
+     */
+    private BigDecimal tareWeight;
+
+    /**
+     * 车辆颜色
+     */
+    private Integer color;
+
+    /**
+     * 环保等级（国标）
+     */
+    private Integer eev;
+
+    /**
+     * 挂车号
+     */
+    private String trailerNo;
+
+    /**
+     * 总运单完成量
+     */
+    private Integer totalComplete;
+
+    /**
+     * 总运单接单量
+     */
+    private Integer totalTake;
+
+    /**
+     * 总运量（净重）
+     */
+    private BigDecimal totalWeight;
+
+    /**
+     * 车辆业务状态
+     */
+    private Integer businessStatus;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckEnt.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 车辆信息与企业关联信息
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTruckEnt extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckImport.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 司机信息信息导入记录
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTruckImport extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 导入文件oss地址
+     */
+    private String url;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckLicense.java

@@ -0,0 +1,64 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @desc 车辆行驶证信息
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTruckLicense extends BaseModel {
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 车辆识别码
+     */
+    private String vin;
+
+    /**
+     * 车辆行驶证号
+     */
+    private String drivingNo;
+
+    /**
+     * 车辆所有人
+     */
+    private String owner;
+
+    /**
+     * 注册日期
+     */
+    private Date regTime;
+
+    /**
+     * 发证机关单位
+     */
+    private String grantUnit;
+
+    /**
+     * 发证日期
+     */
+    private Date grantTime;
+
+    /**
+     * 证书正面URL地址
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面URL地址
+     */
+    private String certificateRevolt;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckReport.java

@@ -0,0 +1,33 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 车辆上报
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTruckReport extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 司机id
+     */
+    private Long driverId;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckReportImport.java

@@ -0,0 +1,28 @@
+package com.sckw.fleet.model;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc 车辆上报导入记录
+ * @author zk
+ * @date 2023/7/6
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KwfTruckReportImport extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 导入文件oss地址
+     */
+    private String url;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfFleetDto.java

@@ -0,0 +1,45 @@
+package com.sckw.fleet.model.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * @author zk
+ * @desc 车队
+ * @date 2023/7/6 0006
+ */
+@Data
+public class KwfFleetDto {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 车队名称
+     */
+    @NotBlank(message = "车队班组不能为空!")
+    @Size(max=20, message = "输入长度不能大于20个字符！")
+    private String name;
+
+    /**
+     * 车队联系人
+     */
+    //@NotBlank(message = "车队长不能为空!")
+    @Size(max=20, message = "输入长度不能大于20个字符！")
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    //@NotBlank(message = "联系电话不能为空!")
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "联系电话格式不正确！")
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfFleetVo.java

@@ -0,0 +1,18 @@
+package com.sckw.fleet.model.vo;
+
+import com.sckw.core.model.base.BaseModel;
+import com.sckw.fleet.model.KwfFleet;
+
+/**
+ * @author zk
+ * @desc 车队信息
+ * @date 2023/7/6 0006
+ */
+public class KwfFleetVo extends KwfFleet {
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+}

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

@@ -0,0 +1,73 @@
+package com.sckw.fleet.service;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.dao.KwfDriverMapper;
+import com.sckw.fleet.model.KwfDriver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @desc 司机
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Service
+public class KwfDriverService {
+
+    @Autowired
+    KwfDriverMapper driverDao;
+
+    /**
+     * @param key 逐渐id
+     * @desc 根据主键查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public KwfDriver selectByKey(Long key) {
+        return driverDao.selectById(key);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 分页查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public List<KwfDriver> findPage(Map<String, Object> params) {
+        return driverDao.selectPage(null, null);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public List<KwfDriver> findList(Map<String, Object> params) {
+        return driverDao.selectPage(null, null);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 新增司机
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public HttpResult add(KwfDriver params) {
+        driverDao.insert(params);
+        return null;
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 修改司机
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public HttpResult update(KwfDriver params) {
+        driverDao.updateById(params);
+        return null;
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.sckw.fleet.service;
+
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.web.context.LoginUserHolder;
+import com.sckw.core.web.model.LoginUserInfo;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.dao.KwfFleetMapper;
+import com.sckw.fleet.model.KwfFleet;
+import com.sckw.fleet.model.dto.KwfFleetDto;
+import com.sckw.fleet.model.vo.KwfFleetVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zk
+ * @desc 车队
+ * @date 2023/7/6 0006
+ */
+@Service
+public class KwfFleetService {
+
+    @Autowired
+    KwfFleetMapper fleetDao;
+
+    /**
+     * @param key 主键id
+     * @desc 根据主键查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public KwfFleet selectByKey(Long key) {
+        return fleetDao.selectById(key);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 分页查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public List<KwfFleetVo> findPage(Map<String, Object> params) {
+        params.put("entId", LoginUserHolder.getEntId());
+        List<KwfFleetVo> fleets = fleetDao.findPage(params);
+        return fleets;
+    }
+
+    /**
+     * @param params 查询参数
+     * @desc 查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public List<Map<String, Object>> findList(Map<String, Object> params) {
+        params.put("entId", LoginUserHolder.getEntId());
+        return fleetDao.findList(params);
+    }
+
+    /**
+     * @param params 新增参数
+     * @desc 新增司机
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public HttpResult add(KwfFleetDto params) {
+        /**车队班组唯一性交易**/
+        List<Map<String, Object>> fleets = fleetDao.findList(new HashMap(){{
+            put("name", params.getName()); put("entId", LoginUserHolder.getEntId());}});
+        if (!CollectionUtils.isEmpty(fleets)) {
+            return HttpResult.error("车队班组已存在！");
+        }
+
+        /**车队班组新增**/
+        KwfFleet fleet = new KwfFleet();
+        BeanUtils.copyProperties(params, fleet);
+        int count = fleetDao.insert(fleet);
+        return count > 0 ? HttpResult.ok("车队信息新增成功！") : HttpResult.error("车队信息新增失败！");
+    }
+
+    /**
+     * @param params 修改参数
+     * @desc 修改司机
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public HttpResult update(KwfFleetDto params) {
+        /**车队班组唯一性交易**/
+        List<Map<String, Object>> fleets = fleetDao.findList(new HashMap(){{
+            put("name", params.getName()); put("entId", LoginUserHolder.getEntId());}});
+        //校验list中对象key值是否存在与value不一致的情况
+        boolean bool = CollectionUtils.listByKeyValueV1(fleets, "id", params.getId());
+        if (bool) {
+            return HttpResult.error("车队班组已存在！");
+        }
+
+        /**车队班组更新**/
+        KwfFleet fleet = new KwfFleet();
+        BeanUtils.copyProperties(params, fleet);
+        int count = fleetDao.updateById(fleet);
+        return count > 0 ? HttpResult.ok("车队信息修改成功！") : HttpResult.error("车队信息修改失败！");
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.sckw.fleet.service;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.dao.KwfTruckMapper;
+import com.sckw.fleet.model.KwfTruck;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zk
+ * @desc 车辆
+ * @date 2023/7/6 0006
+ */
+@Service
+public class KwfTruckService {
+
+    @Autowired
+    KwfTruckMapper truckDao;
+
+    /**
+     * @param key 主键id
+     * @desc 根据主键查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public KwfTruck selectByKey(Long key) {
+        return truckDao.selectById(key);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 分页查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public List<KwfTruck> findPage(Map<String, Object> params) {
+        return truckDao.selectPage(null, null);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public List<KwfTruck> findList(Map<String, Object> params) {
+        return truckDao.selectPage(null, null);
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 新增司机
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public HttpResult add(KwfTruck params) {
+        truckDao.insert(params);
+        return null;
+    }
+
+    /**
+     * @param params 分页参数
+     * @desc 修改司机
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public HttpResult update(KwfTruck params) {
+        truckDao.updateById(params);
+        return null;
+    }
+}

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverCardMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfDriverCardMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverEntMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfDriverEntMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverImportMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfDriverImportMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverLicenseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfDriverLicenseMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfDriverMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverQualificationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfDriverQualificationMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfFleetDriverMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfFleetDriverMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfFleetMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfFleetMapper">
+
+    <select id="findPage" resultType="com.sckw.fleet.model.vo.KwfFleetVo" parameterType="java.util.Map" >
+        select
+            id, name, contacts, phone, remark, status, create_by createBy, create_time createTime,
+            update_by updateBy, update_time updateTime
+        from kwf_fleet fl
+        where fl.del_flag = 0
+        <if test="entId != null and entId != ''">
+            and fl.ent_id = #{entId, jdbcType=VARCHAR}
+        </if>
+        <if test="name != null and name != ''">
+            and fl.name = #{name, jdbcType=VARCHAR}
+        </if>
+        <if test="contacts != null and contacts != ''">
+            and fl.contacts = #{contacts, jdbcType=VARCHAR}
+        </if>
+        <if test="phone != null and phone != ''">
+            and fl.phone = #{phone, jdbcType=VARCHAR}
+        </if>
+        <if test="keywords != null and keywords != ''">
+            and (
+                fl.name like concat('%',#{keywords},'%')
+                or fl.contacts like concat('%',#{keywords},'%')
+                or fl.phone like concat('%',#{keywords},'%')
+            )
+        </if>
+        ORDER BY fl.create_time desc
+    </select>
+
+    <select id="findList" resultType="java.util.Map" parameterType="java.util.Map" >
+        select
+            id, name, contacts, phone, remark
+        from kwf_fleet fl
+        where fl.del_flag = 0
+        <if test="entId != null and entId != ''">
+            and fl.ent_id = #{entId, jdbcType=VARCHAR}
+        </if>
+        <if test="name != null and name != ''">
+            and fl.name = #{name, jdbcType=VARCHAR}
+        </if>
+        <if test="contacts != null and contacts != ''">
+            and fl.contacts = #{contacts, jdbcType=VARCHAR}
+        </if>
+        <if test="phone != null and phone != ''">
+            and fl.phone = #{phone, jdbcType=VARCHAR}
+        </if>
+        <if test="keywords != null and keywords != ''">
+            and (
+                fl.name like concat('%',#{keyWords},'%')
+                or fl.contacts like concat('%',#{keyWords},'%')
+                or fl.phone like concat('%',#{keyWords},'%')
+            )
+        </if>
+        ORDER BY fl.create_time desc
+    </select>
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfFleetTruckMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfFleetTruckMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTransportLicenseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTransportLicenseMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckEntMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTruckEntMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckImportMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTruckImportMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckLicenseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTruckLicenseMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTruckMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckReportImportMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTruckReportImportMapper">
+
+</mapper>

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckReportMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.fleet.dao.KwfTruckReportMapper">
+
+</mapper>