Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/RestInfoController.java

@@ -35,13 +35,6 @@ public class RestInfoController {
     @Resource
     private RestInfoService restInfoService;
 
-    @ApiOperation(value = "上报途中休息信息",notes="开始时间、结束时间必传")
-    @PostMapping("/add")
-    public Result add(@RequestBody RestInfo restInfo) {
-        Boolean flag = restInfoService.save(restInfo);
-        return new Result<>(flag);
-    }
-
     @ApiOperation(value = "获取途中休息信息列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<RestInfo> pageParam) {

src/main/java/com/aoyang/tms/controller/ShipperController.java

@@ -82,7 +82,7 @@ public class ShipperController {
 
         log.info("添加托运方,调用/tms/shipper/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getOrgName() == null
-                || param.getOrgShortName() == null || param.getShipperName() == null) {
+                 || param.getShipperName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

src/main/java/com/aoyang/tms/controller/TruckCheckInfoController.java

@@ -36,16 +36,6 @@ public class TruckCheckInfoController {
     @Resource
     private TruckCheckInfoService truckCheckInfoService;
 
-    @ApiOperation(value = "上报出车前车辆检查信息",notes="新增或修改车辆检车信息")
-    @PostMapping("/add")
-    public Result add(@RequestBody TruckCheckInfo truckCheckInfo) {
-        //TODO SAVE OR UPDATE
-        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
-        //不同类型，验证信息不一样
-        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
-        return new Result<>(flag);
-    }
-
     @ApiOperation(value = "查找车辆检查信息",notes="")
     @PostMapping("/find")
     public Result<TruckCheckInfo> find(@RequestBody TruckCheckInfo truckRepairInfo) {

src/main/java/com/aoyang/tms/controller/TruckDeptController.java

@@ -83,8 +83,7 @@ public class TruckDeptController {
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody TruckDept param) {
         log.info("新增运力部门,调用/tms/truck_dept/add,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getOrgId() == null || param.getName() == null || param.getOrgName() == null
-                || param.getOrgShortName() == null) {
+        if (param == null || param.getOrgId() == null || param.getName() == null || param.getOrgName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;
@@ -109,8 +108,10 @@ public class TruckDeptController {
         if (param == null || param.getId() == null || param.getOrgId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        if (commonService.findOrgTruckNumber(param.getOrgId(), param.getId()) != 0) {
-            return new Result<>(ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getCode(), ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getMessage());
+        if (commonService.findOrgTruckNumber(param.getOrgId(), param.getId()) != null) {
+            if (commonService.findOrgTruckNumber(param.getOrgId(), param.getId()) != 0){
+                return new Result<>(ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getCode(), ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getMessage());
+            }
         }
         return new Result<>(truckDeptService.removeById(param));
     }

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -6,6 +6,8 @@ import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
 import com.aoyang.tms.entity.User;
+import com.aoyang.tms.entity.WorkSpot;
+import com.aoyang.tms.service.CommonService;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -18,8 +20,9 @@ import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.util.*;
 import javax.annotation.Resource;
-import  com.aoyang.tms.service.TruckEscortService;
-import  com.aoyang.tms.entity.TruckEscort;
+
+import com.aoyang.tms.service.TruckEscortService;
+import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,8 +32,8 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 车辆押运员表 控制器
-    * </p>
+ * 车辆押运员表 控制器
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
@@ -43,23 +46,36 @@ public class TruckEscortController {
 
     @Resource
     private TruckEscortService truckEscortService;
+    @Resource
+    private CommonService commonService;
 
-    @ApiOperation(value = "获取车辆押运员分页列表",notes="")
-    @PostMapping("/list")
+
+    @ApiOperation(value = "获取车辆押运员分页列表", notes = "必传参数:orgId选填参数:keyWord(查escortName,mobile)")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<TruckEscortListParam> pageParam) {
-        log.info("获取运力部门管理分页列表,调用/tms/truck_dept/page_list,参数:{}", JSON.toJSONString(pageParam));
+        log.info("获取车辆押运员分页列表,调用/tms/truck_escort/page_list,参数:{}", JSON.toJSONString(pageParam));
         if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getOrgId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         return new Result<>(truckEscortService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "添加车辆押运员",notes="新增一条truck_escort")
+    @ApiOperation(value = "根据条件获取车辆押运员列表", notes = "必传参数:orgId;选填参数:truckId,carNumber,keyWord(查escortName,mobile)")
+    @PostMapping("/list")
+    public Result list(@RequestBody TruckEscortListParam param) {
+        log.info("根据条件获取车辆押运员列表,调用/tms/truck_escort/list,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckEscortService.list(param));
+    }
+
+    @ApiOperation(value = "添加车辆押运员", notes = "必传参数:orgId,escortName,mobile")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody TruckEscortAddParam param) {
-        log.info("新增运力部门,调用/tms/truck_dept/add,参数:{}", JSON.toJSONString(param));
+        log.info("添加车辆押运员,调用/tms/truck_escort/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getEscortName() == null || param.getMobile() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -76,12 +92,46 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.add(param));
     }
 
-    @ApiOperation(value = "修改truck_escort",notes="根据id修改truck_escort")
+    @ApiOperation(value = "修改车辆押运员", notes = "必传参数:userId")
     @PostMapping("/update")
-    public Result update(@RequestBody TruckEscort truckEscort) {
-        Boolean flag = truckEscortService.updateById(truckEscort);
-        return new Result<>(flag);
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody TruckEscort param) {
+        log.info("修改作业点,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getEscortId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(truckEscortService.edit(param));
+    }
+
+    @ApiOperation(value = "删除车辆押运员", notes = "必传参数：userId")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody TruckEscort param) {
+        log.info("删除车辆押运员,调用/tms/truck_escort/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getEscortId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        commonService.deleteUser(param.getEscortId());
+        return new Result<>(truckEscortService.removeById(param));
     }
 
+    @ApiOperation(value = "获取单个车辆押运员详情", notes = "必传参数：userId")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TruckEscort param) {
+        log.info("删除车辆押运员,调用/tms/truck_escort/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getEscortId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckEscortService.getById(param));
+    }
 
 }

src/main/java/com/aoyang/tms/controller/TruckRepairInfoController.java

@@ -41,13 +41,6 @@ public class TruckRepairInfoController {
         return new Result<>(new TruckRepairInfo());
     }
 
-    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
-    @PostMapping("/add")
-    public Result<TruckRepairInfo> add(@RequestBody TruckRepairInfo truckRepairInfo) {
-        //TODO SAVE OR UPDATE
-        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
-        return new Result<>(new TruckRepairInfo());
-    }
 
     @ApiOperation(value = "获取truck_repair_info列表",notes="")
     @PostMapping("/list")

src/main/java/com/aoyang/tms/controller/WorkSpotController.java

@@ -83,7 +83,7 @@ public class WorkSpotController {
 
         log.info("添加作业点,调用/tms/work_spot/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getType() == null || param.getOrgName() == null
-                || param.getOrgShortName() == null || param.getSpotName() == null) {
+                || param.getSpotName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -4,18 +4,22 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.controller.param.WorkOrderPageParam;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
-import com.aoyang.tms.entity.WorkOrder;
-import com.aoyang.tms.service.CommonService;
-import com.aoyang.tms.service.WorkOrderService;
+import com.aoyang.tms.entity.*;
+import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Description: 作业人员相关接口
@@ -31,9 +35,17 @@ public class WorkerController {
 
     @Resource
     private WorkOrderService workOrderService;
-
+    @Resource
+    private RestInfoService restInfoService;
+    @Resource
+    private WorkCycleService workCycleService;
     @Resource
     private CommonService commonService;
+    @Resource
+    private TruckCheckInfoService truckCheckInfoService;
+    @Resource
+    private WorkLogService workLogService;
+
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
@@ -47,12 +59,81 @@ public class WorkerController {
         return new Result<>(workerInfo1);
     }
 
-    @ApiOperation(value = "运单列表", notes = "获取司机或押运员的运单列表")
-    @PostMapping("/find_work_order_page")
-    public Result<IPage<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
-                                                        @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
-        IPage<WorkOrderVO> records = null;
+    @ApiOperation(value = "运单列表", notes = "移动端获取司机或押运员的待执行或执行中的运单列表")
+    @PostMapping("/find_work_order_list")
+    public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
+                                                       @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+        List<WorkOrderVO> records = new ArrayList<WorkOrderVO>();
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "历史行车列表", notes = "必传参数:truckId")
+    @PostMapping("/work_cycle_page")
+    public Result work_cycle_page(@RequestBody PageParam<WorkCycle> pageParam) {
+        Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkCycle> records = workCycleService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "上报途中休息信息",notes="开始时间、结束时间必传")
+    @PostMapping("/add_rest_info")
+    public Result add_rest_info(@RequestBody RestInfo restInfo) {
+        Boolean flag = restInfoService.save(restInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
+    @PostMapping("/add_truck_repair_info")
+    public Result<TruckRepairInfo> add_truck_repair_info(@RequestBody TruckRepairInfo truckRepairInfo) {
+        //TODO SAVE OR UPDATE
+        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
+        return new Result<>(new TruckRepairInfo());
+    }
+
+    @ApiOperation(value = "上报车辆检查信息",notes="新增或修改车辆检车信息")
+    @PostMapping("/add_truck_check_info")
+    public Result add_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
+        //TODO SAVE OR UPDATE
+        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
+        //不同类型，验证信息不一样
+        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "获取行车日志列表",notes="卡车id必传")
+    @PostMapping("/work_log_list")
+    public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
+        Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkLog> records = workLogService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
     }
 
+    @ApiOperation(value = "装车等待上报", notes = "")
+    @PostMapping("/add_zhuangche_wait")
+    public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "卸车等待上报", notes = "")
+    @PostMapping("/add_xieche_wait")
+    public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+
+    @ApiOperation(value = "装车成果上报", notes = "")
+    @PostMapping("/add_zhuangche_result")
+    public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "卸车成果上报", notes = "")
+    @PostMapping("/add_xieche_result")
+    public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
 }

src/main/java/com/aoyang/tms/controller/WorkerController1.java

@@ -1,108 +0,0 @@
-package com.aoyang.tms.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.aoyang.common.param.PageParam;
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.common.ErrCodeEnum;
-import com.aoyang.tms.controller.param.Truck;
-import com.aoyang.tms.controller.vo.WorkOrderVO;
-import com.aoyang.tms.controller.vo.WorkerInfo;
-import com.aoyang.tms.entity.RestInfo;
-import com.aoyang.tms.entity.TruckCheckInfo;
-import com.aoyang.tms.entity.TruckRepairInfo;
-import com.aoyang.tms.entity.WorkOrder;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.time.LocalDateTime;
-
-/**
- * @Description: 作业人员相关接口
- * @Author guoyong
- * @Date 2022/4/20 16:50
- * @Version 1.0
- */
-@RestController
-@Slf4j
-@Api(value = "circleCRUD接口")
-@RequestMapping("/tms/worker")
-public class WorkerController1 {
-
-    @ApiOperation(value = "获取运单详情", notes = "")
-    @PostMapping("/get_worker_order_info")
-    public Result<WorkOrder> getWorkerOrderInfo(@RequestBody WorkOrder param) {
-        return new Result<>(new WorkOrder());
-    }
-
-    @ApiOperation(value = "获取运单分页列表", notes = "根据司机id获取运单分页列表")
-    @PostMapping("/worker_order_page_list")
-    public Result<Page<WorkOrder>> workerOrderPageList(@RequestHeader(value = "userId") Long userId,
-                                                       @RequestBody PageParam<WorkOrder> pageParam) {
-        log.info("获取圈子分页列表,调用/tms/worker/worker_order_page_list,参数:{}", JSON.toJSONString(pageParam));
-        if (pageParam == null || pageParam.getParam() == null) {
-            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        return new Result<>(null);
-    }
-
-    @ApiOperation(value = "途中上报-途中休息", notes = "根据司机id获取运单分页列表")
-    @PostMapping("/add_rest_info")
-    public Result<RestInfo> addRestInfo(@RequestHeader(value = "userId") Long userId,
-                                        @RequestHeader(value = "userName") String userName,
-                                        @RequestBody RestInfo param) {
-        if (param.getOrgId() == null || param.getOrgName() == null || param.getTruckId() == null
-                || param.getCarNumber() == null || param.getStartTime() == null || param.getEndTime() == null) {
-            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        String utf8Name = userName;
-        try {
-            utf8Name = URLDecoder.decode(userName, "UTF-8");
-        } catch (UnsupportedEncodingException ignored) {
-        }
-        param.setCreater(userId);
-        param.setCreaterName(utf8Name);
-        param.setCreateDate(LocalDateTime.now());
-
-        return new Result<>(new RestInfo());
-    }
-
-    @ApiOperation(value = "途中上报-途中检查", notes = "根据司机id获取运单分页列表")
-    @PostMapping("/add_truck_check_info")
-    public Result<TruckCheckInfo> addTruckCheckInfo(@RequestHeader(value = "userId") Long userId,
-                                                    @RequestHeader(value = "userName") String userName,
-                                                    @RequestBody TruckCheckInfo param) {
-        String utf8Name = userName;
-        try {
-            utf8Name = URLDecoder.decode(userName, "UTF-8");
-        } catch (UnsupportedEncodingException ignored) {
-        }
-        param.setCreater(userId);
-        param.setCreaterName(utf8Name);
-        param.setCreateDate(LocalDateTime.now());
-
-        return new Result<>(new TruckCheckInfo());
-    }
-
-    @ApiOperation(value = "途中上报-途中维修", notes = "根据司机id获取运单分页列表")
-    @PostMapping("/add_truck_repair_info")
-    public Result<TruckRepairInfo> addTruckRepairInfo(@RequestHeader(value = "userId") Long userId,
-                                                      @RequestHeader(value = "userName") String userName,
-                                                      @RequestBody TruckRepairInfo param) {
-        String utf8Name = userName;
-        try {
-            utf8Name = URLDecoder.decode(userName, "UTF-8");
-        } catch (UnsupportedEncodingException ignored) {
-        }
-        param.setCreater(userId);
-        param.setCreaterName(utf8Name);
-        param.setCreateDate(LocalDateTime.now());
-
-        return new Result<>(new TruckRepairInfo());
-    }
-
-}

src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -32,6 +32,14 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     @ApiModelProperty(value = "已读未读状态,0未读，1已读")
     private Integer readFlag;
 
+
+    @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
+    private Integer truckStatus;
+
+    @ApiModelProperty(value = "已用时，单位分钟")
+    private int time;
+
+
     @ApiModelProperty(value = "装卸车点经度")
     @TableField("longitude")
     private String longitude;

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -89,5 +89,9 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
+    @ApiModelProperty(value = "上次位置更新时间")
+    private String lastTime;
+
+
 
 }

src/main/java/com/aoyang/tms/entity/TruckEscort.java

@@ -31,9 +31,9 @@ public class TruckEscort implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户id（tms.driver.user_id）")
-    @TableField("escort_id")
+    @TableId("escort_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long userId;
+    private Long escortId;
 
     @ApiModelProperty(value = "卡车id")
     @TableField("truck_id")

src/main/java/com/aoyang/tms/entity/User.java

@@ -29,16 +29,16 @@ public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
     @ApiModelProperty(value = "用户id（调用API生成）")
     @TableId(value = "user_id", type = IdType.INPUT)
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 
+    @ApiModelProperty(value = "组织id（user.org.org_id）")
+    @TableField("org_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
     @ApiModelProperty(value = "登录用户")
     @TableField("user_code")
     private String userCode;
@@ -97,6 +97,9 @@ public class User implements Serializable {
     @TableField("org_name")
     private String orgName;
 
+    @ApiModelProperty(value = "组织简称（user.org.org_name）")
+    private String orgShortName;
+
     @ApiModelProperty(value = "创建人Name")
     @TableField("creater_name")
     private String createrName;

src/main/java/com/aoyang/tms/service/TruckEscortService.java

@@ -9,6 +9,8 @@ import com.aoyang.tms.entity.TruckEscort;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 车辆押运员表 服务类
@@ -29,6 +31,15 @@ public interface TruckEscortService extends IService<TruckEscort> {
     IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam);
 
     /**
+     * @return
+     * @Author chengang
+     * @Description 根据条件获取车辆押运员列表
+     * @Date 2021/11/9
+     * @Param
+     **/
+    List<TruckEscort> list(TruckEscortListParam param);
+
+    /**
      * @Author guoyong
      * @Description 查找押运员
      * @Date  2022/4/22
@@ -46,4 +57,13 @@ public interface TruckEscortService extends IService<TruckEscort> {
      **/
     boolean add(TruckEscortAddParam param);
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 修改押运员信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    boolean edit(TruckEscort param);
+
 }

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -104,9 +104,9 @@ public class CommonServiceImpl implements CommonService {
         log.info("findTruckInfo findTruckEscort:{}", JSON.toJSONString(truckEscort));
 
         if (truckEscort != null) {
-            workerInfo.setEscortId(truckEscort.getUserId());
+            workerInfo.setEscortId(truckEscort.getEscortId());
             workerInfo.setEscortName(truckEscort.getEscortName());
-            User user = findUser(truckEscort.getUserId());
+            User user = findUser(truckEscort.getEscortId());
             if (user != null) {
                 workerInfo.setEscortPhone(user.getMobile());
             }
@@ -181,7 +181,7 @@ public class CommonServiceImpl implements CommonService {
 
     @Override
     public boolean verifyResult(Result result) {
-        return false;
+        return null != result && result.getCode() == 0;
     }
 
     @Override

src/main/java/com/aoyang/tms/service/impl/TruckDeptServiceImpl.java

@@ -51,7 +51,10 @@ public class TruckDeptServiceImpl extends ServiceImpl<TruckDeptMapper, TruckDept
             truckDeptListVO.setUpdater(truckDept.getUpdater());
             truckDeptListVO.setUpdateDate(truckDept.getUpdateDate());
             truckDeptListVO.setUpdaterName(truckDept.getUpdaterName());
-            truckDeptListVO.setTruckNum(commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()));
+            truckDeptListVO.setTruckNum(0);
+            if (commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()) != null) {
+                truckDeptListVO.setTruckNum(commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()));
+            }
             truckDeptListVO.setOrgId(truckDept.getOrgId());
             listVo.add(truckDeptListVO);
         }

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -1,24 +1,23 @@
 package com.aoyang.tms.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
-import com.aoyang.tms.controller.vo.TruckDeptListVO;
-import com.aoyang.tms.entity.Shipper;
-import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.User;
 import com.aoyang.tms.mapper.TruckEscortMapper;
+import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.TruckEscortService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,15 +29,21 @@ import java.util.List;
  * @since 2022-04-20
  */
 @Service
+@Slf4j
 public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, TruckEscort> implements TruckEscortService {
 
     @Resource
     TruckEscortMapper truckEscortMapper;
+    @Resource
+    private CommonService commonService;
 
     @Override
     public IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam) {
         Page<TruckEscort> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         QueryWrapper<TruckEscort> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getOrgId() != null) {
+            queryWrapper.like("org_id", pageParam.getParam().getOrgId());
+        }
         if (pageParam.getParam().getKeyWord() != null) {
             queryWrapper.like("escort_name", pageParam.getParam().getKeyWord()).or().like("mobile", pageParam.getParam().getKeyWord());
         }
@@ -47,6 +52,25 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
     }
 
     @Override
+    public List<TruckEscort> list(TruckEscortListParam param) {
+        QueryWrapper<TruckEscort> queryWrapper = new QueryWrapper<>();
+        if (param.getOrgId() != null) {
+            queryWrapper.eq("org_id", param.getOrgId());
+        }
+        if (param.getTruckId() != null) {
+            queryWrapper.eq("truck_id", param.getTruckId());
+        }
+        if (param.getCarNumber() != null) {
+            queryWrapper.like("car_number", param.getCarNumber());
+        }
+        if (param.getKeyWord() != null) {
+            queryWrapper.like("escort_name", param.getKeyWord()).or().like("mobile", param.getKeyWord());
+        }
+        List<TruckEscort> list = list(queryWrapper.orderByDesc("update_date"));
+        return list;
+    }
+
+    @Override
     public TruckEscort findTruckEscort(TruckEscort truckEscort) {
         QueryWrapper<TruckEscort> queryWrapper = Wrappers.query();
         queryWrapper.eq("truck_id", truckEscort.getTruckId());
@@ -56,10 +80,50 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
 
     @Override
     public boolean add(TruckEscortAddParam param) {
+        boolean flag = false;
         User user = new User();
         user.setBaseRole("driver");
         user.setUserType(2);
         user.setOrgId(param.getOrgId());
-        return false;
+        user.setMobile(param.getMobile());
+        user.setUserName(param.getEscortName());
+        user.setCreater(param.getCreater());
+        user.setCreaterName(param.getCreaterName());
+        user.setCreateDate(param.getCreateDate());
+        User userSave = commonService.addUser(user);
+        log.info("添加新的user,参数:{}", JSON.toJSONString(userSave));
+
+        if (userSave != null) {
+            log.info("添加新的user,参数:{}", JSON.toJSONString(userSave));
+            TruckEscort truckEscort = new TruckEscort();
+            truckEscort.setEscortId(userSave.getUserId());
+            truckEscort.setEscortName(userSave.getUserName());
+            truckEscort.setMobile(userSave.getMobile());
+            truckEscort.setCreater(param.getCreater());
+            truckEscort.setCreaterName(param.getCreaterName());
+            truckEscort.setCreateDate(param.getCreateDate());
+            truckEscort.setOrgId(userSave.getOrgId());
+            truckEscort.setOrgName(userSave.getOrgName());
+            truckEscort.setUpdater(param.getCreater());
+            truckEscort.setUpdaterName(param.getCreaterName());
+            truckEscort.setUpdateDate(param.getCreateDate());
+            flag = saveOrUpdate(truckEscort);
+        }
+        return flag;
+    }
+
+    @Override
+    public boolean edit(TruckEscort param) {
+        if (param.getMobile() != null || param.getEscortName() != null) {
+            User user = new User();
+            if (param.getMobile() != null) {
+                user.setMobile(param.getMobile());
+            }
+            if (param.getEscortName() != null) {
+                user.setUserName(param.getEscortName());
+            }
+            commonService.updateUser(user);
+        }
+        return updateById(param);
     }
 }