押运员id修改

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

@@ -98,7 +98,7 @@ public class TruckEscortController {
                          @RequestHeader(value = "userName") String userName,
                          @RequestBody TruckEscort param) {
         log.info("修改作业点,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getUserId() == null) {
+        if (param == null || param.getEscortId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;
@@ -117,10 +117,10 @@ public class TruckEscortController {
     @PostMapping("/delete")
     public Result delete(@RequestBody TruckEscort param) {
         log.info("删除车辆押运员,调用/tms/truck_escort/delete,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getUserId() == null) {
+        if (param == null || param.getEscortId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        commonService.deleteUser(param.getUserId());
+        commonService.deleteUser(param.getEscortId());
         return new Result<>(truckEscortService.removeById(param));
     }
 
@@ -128,7 +128,7 @@ public class TruckEscortController {
     @PostMapping("/get_one")
     public Result getOne(@RequestBody TruckEscort param) {
         log.info("删除车辆押运员,调用/tms/truck_escort/get_one,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getUserId() == null) {
+        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/entity/TruckEscort.java

@@ -33,7 +33,7 @@ public class TruckEscort implements Serializable {
     @ApiModelProperty(value = "用户id（tms.driver.user_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/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());
             }

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

@@ -96,7 +96,7 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
         if (userSave != null) {
             log.info("添加新的user,参数:{}", JSON.toJSONString(userSave));
             TruckEscort truckEscort = new TruckEscort();
-            truckEscort.setUserId(userSave.getUserId());
+            truckEscort.setEscortId(userSave.getUserId());
             truckEscort.setEscortName(userSave.getUserName());
             truckEscort.setMobile(userSave.getMobile());
             truckEscort.setCreater(param.getCreater());

src/main/resources/mapper/TruckEscortMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckEscort">
-        <id column="escort_id" property="userId" />
+        <id column="escort_id" property="escortId" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
         <result column="org_id" property="orgId" />