1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FleetMemberInfo.java

@@ -156,6 +156,11 @@ public class FleetMemberInfo extends BaseModel<FleetMemberInfo> {
      */
     @TableField(exist = false)
     private String readFlag;
+    /**
+     * 司机电话
+     */
+    @TableField(exist = false)
+    private String driverPhone;
 
 
     @Override

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FleetInfoServiceImpl.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.yh.saas.plugin.yiliangyiyun.entity.FleetInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.FleetMemberInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.FleetInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.service.IFleetInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.IFleetMemberInfoService;
@@ -37,6 +39,8 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
     @Autowired
     private IFleetMemberInfoService fleetMemberInfoService;
+    @Autowired
+    private ICommonUserService commonUserService;
 
     /**
      * 添加车队
@@ -141,6 +145,13 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
         //根据车队id查询已加入车队的车队成员列表
         List<FleetMemberInfo> fleetMemberInfos = fleetMemberInfoService.selectList(new EntityWrapper<FleetMemberInfo>()
                 .eq("fleet_id", fleetInfo.getId()).eq("delete_flag", "0").eq("status_key", "5"));
+        if (CollectionUtils.isNotEmpty(fleetMemberInfos)){
+            for (FleetMemberInfo fleetMemberInfo1 : fleetMemberInfos){
+                //查询司机电话
+                CommonUser commonUser = commonUserService.selectById(fleetMemberInfo1.getCommonId());
+                fleetMemberInfo1.setDriverPhone(commonUser.getPhone());
+            }
+        }
         fleetInfo1.setFleetMemberInfoList(fleetMemberInfos);
         fleetInfo1.setFleetMemberNum(fleetMemberInfos.size());
         return fleetInfo1;