truck_driver

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

@@ -14,11 +14,14 @@ import lombok.Data;
 @Data
 public class WorkerInfo {
 
+    @ApiModelProperty(value = "押运员id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long escortId;
+
     @ApiModelProperty(value = "卡车id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long truckId;
 
-
     @ApiModelProperty(value = "所属部门id")
     private Long deptId;
 
@@ -39,10 +42,6 @@ public class WorkerInfo {
     @ApiModelProperty(value = "司机2姓名")
     private String driverNameTwo;
 
-    @ApiModelProperty(value = "押运员id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long escortId;
-
     @ApiModelProperty(value = "押运员姓名")
     private String escortName;
 

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

@@ -13,4 +13,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface TruckEscortService extends IService<TruckEscort> {
 
+    /**
+     * @Author guoyong
+     * @Description 查找押运员
+     * @Date  2022/4/22
+     * @Param
+     * @return
+    **/
+    TruckEscort findTruckEscort(TruckEscort truckEscort);
+
 }

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

@@ -79,12 +79,14 @@ public class CommonServiceImpl implements CommonService {
             }
         }
 
-        log.info("findTruckInfo getById 参数:{}", JSON.toJSONString(truckId));
-        TruckEscort truckEscort = truckEscortService.getById(truckId);
-        log.info("findTruckInfo getById:{}", JSON.toJSONString(truckEscort));
+        TruckEscort truckEscortParam = new TruckEscort();
+        truckEscortParam.setTruckId(truckId);
+        log.info("findTruckInfo findTruckEscort 参数:{}", JSON.toJSONString(truckEscortParam));
+        TruckEscort truckEscort = truckEscortService.findTruckEscort(truckEscortParam);
+        log.info("findTruckInfo findTruckEscort:{}", JSON.toJSONString(truckEscort));
 
         if (truckEscort != null) {
-            workerInfo.setEscortId(truckEscort.getTruckId());
+            workerInfo.setEscortId(truckEscort.getUserId());
             workerInfo.setEscortName(truckEscort.getEscortName());
         }
 

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

@@ -3,9 +3,13 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.mapper.TruckEscortMapper;
 import com.aoyang.tms.service.TruckEscortService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 车辆押运员表 服务实现类
@@ -17,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, TruckEscort> implements TruckEscortService {
 
+    @Resource
+    TruckEscortMapper truckEscortMapper;
+
+    @Override
+    public TruckEscort findTruckEscort(TruckEscort truckEscort) {
+        QueryWrapper<TruckEscort> queryWrapper = Wrappers.query();
+        queryWrapper.eq("truck_id", truckEscort.getTruckId());
+        TruckEscort truckEscort1 = truckEscortMapper.selectOne(queryWrapper);
+        return truckEscort1;
+    }
 }