1

.gitignore

@@ -170,3 +170,5 @@ Dockerfile
 /.recommenders/
 templates/1657067591042.png
 templates/1657067591895.png
+core.20230626.131324.27656.0001.dmp
+javacore.20230626.131324.27656.0002.txt

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java

@@ -3,7 +3,6 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.DistinguishView;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
 import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
@@ -11,6 +10,8 @@ import com.yh.saas.plugin.yiliangyiyun.util.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -137,5 +138,14 @@ public class CargoOwnerInfoController {
     public HyCargoOwnerInfo selectAccountBalance(String id,String flag){
         return cargoOwnerInfoService.selectAccountBalance(id,flag);
     }
+    /**
+     * 查询已认证货主列表
+     * @param hyCargoOwnerInfo
+     * @return
+     */
+    @GetMapping("/selectCargoOwnerList")
+    public List<HyCargoOwnerInfo> selectCargoOwnerList(HyCargoOwnerInfo hyCargoOwnerInfo){
+        return cargoOwnerInfoService.selectCargoOwnerList(hyCargoOwnerInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.List;
 
 /**
  * <p>
@@ -188,5 +189,14 @@ public class DriverInfoController {
     public Page<HyDriverInfo> selectDriverInfoSubmission(HyDriverInfo hyDriverInfo){
         return driverInfoService.selectDriverInfoSubmission(hyDriverInfo);
     }
+    /**
+     * 查询已认证司机列表
+     * @param hyDriverInfo
+     * @return
+     */
+    @GetMapping("/selectDriverList")
+    public List<HyDriverInfo> selectDriverList(HyDriverInfo hyDriverInfo){
+        return driverInfoService.selectDriverList(hyDriverInfo);
+    }
 }
 

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

@@ -5,6 +5,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -86,4 +88,6 @@ public interface ICargoOwnerInfoService extends IService<HyCargoOwnerInfo> {
      * @return
      */
     HyCargoOwnerInfo selectAccountBalance(String id,String flag);
+
+    List<HyCargoOwnerInfo> selectCargoOwnerList(HyCargoOwnerInfo hyCargoOwnerInfo);
 }

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

@@ -9,6 +9,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.view.Root;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.List;
 
 /**
  * <p>
@@ -105,4 +106,5 @@ public interface IDriverInfoService extends IService<HyDriverInfo> {
      */
     Page<HyDriverInfo> selectDriverInfoSubmission(HyDriverInfo hyDriverInfo);
 
+    List<HyDriverInfo> selectDriverList(HyDriverInfo hyDriverInfo);
 }

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

@@ -339,6 +339,22 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
         return hyCargoOwnerInfo;
     }
 
+    @Override
+    public List<HyCargoOwnerInfo> selectCargoOwnerList(HyCargoOwnerInfo hyCargoOwnerInfo) {
+        List<HyCargoOwnerInfo> hyCargoOwnerInfoList=this.selectList(new EntityWrapper<HyCargoOwnerInfo>()
+                .eq("authentication_status","已认证"));
+        if (!CollectionUtils.isEmpty(hyCargoOwnerInfoList)){
+            for (HyCargoOwnerInfo hyCargoOwnerInfo1:hyCargoOwnerInfoList){
+                //根据货主个人信息查询货主所属公司信息
+                List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfoList = cargoOwnerCompInfoService.selectList(new EntityWrapper<HyCargoOwnerCompInfo>()
+                        .eq(HyCargoOwnerCompInfo.QueryFiles.COMMON_ID, hyCargoOwnerInfo1.getCommonId()).eq(HyCargoOwnerCompInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                if(!CollectionUtils.isEmpty(hyCargoOwnerCompInfoList)){
+                    hyCargoOwnerInfo1.setHyCargoOwnerCompInfoList(hyCargoOwnerCompInfoList);
+                }
+            }
+        }
+        return hyCargoOwnerInfoList;
+    }
 
 
 }

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

@@ -200,6 +200,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 hyDriverPayeeInfo.setDriverId(hyDriverInfo.getId());
                 hyDriverPayeeInfo.setCommonId(hyDriverInfo.getCommonId());
             }
+            boolean three = driverPayeeInfoService.insertBatch(hyDriverPayeeInfoList);
         }
 
 //        //上报
@@ -229,10 +230,9 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
 //        hyDriverInfo.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
 
         boolean one = this.insert(hyDriverInfo);
-        boolean three = driverPayeeInfoService.insertBatch(hyDriverPayeeInfoList);
 
         // 假如 都成功返回ok
-        if (one && three) {
+        if (one ) {
             return "OK";
         } else {
             return "NG";
@@ -621,4 +621,11 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         page.setSize(hyDriverInfo.getPageSize());
         return page;
     }
+
+    @Override
+    public List<HyDriverInfo> selectDriverList(HyDriverInfo hyDriverInfo) {
+        List<HyDriverInfo> hyDriverInfoList=this.selectList(new EntityWrapper<HyDriverInfo>()
+        .eq("authentication_status","已认证"));
+        return hyDriverInfoList;
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverCarInfoMapper.xml

@@ -51,6 +51,9 @@
         c.vehicle_type as vehicleType,
         c.gua_use_nature as guaUseNature,
         c.owner,
+        c.car_code as carCode,
+        c.trailer_vehicle_type as trailerVehicleType,
+        c.trailer_car_code as trailerCarCode,
         c.gua_owner as guaOwner,
         c.gua_car_long as guaCarLong,
         c.gua_car_width as guaCarWidth,