欠款开票移动端调整

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -297,10 +297,6 @@ public interface BaseVehicleFeign {
     @PostMapping("/vehicleQKKPList")
     ResultBean<PagerVo<BaseVehicleQKKPVo>> vehicleQKKPList(@RequestBody PagerQuery<BaseVehicleQKKPQuery> pagerQuery);
 
-    @ApiOperation("移动端-欠款开票选择车辆分页列表")
-    @PostMapping("/appVehicleQKKPList")
-    ResultBean<List<BaseVehicleQKKPVo>> appVehicleQKKPList(@RequestBody BaseVehicleQKKPQuery query);
-
     @ApiOperation("采购退库更新状态")
     @PostMapping("/updateByVinNo")
     ResultBean updateByVinNo(@RequestBody BaseVehicleUpdateQuery baseVehicleUpdateQuery);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -177,11 +177,6 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
-    @Override
-    public ResultBean<List<BaseVehicleQKKPVo>> appVehicleQKKPList(BaseVehicleQKKPQuery query) {
-        return null;
-    }
-
     @Override
     public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -501,6 +501,4 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     List<BaseVehicleExportVo> selByExcel(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleExportVo> qw);
 
     IPage<BaseVehicleQKKPVo> vehicleQKKPPageList(IPage<BaseVehicleQKKPVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
-
-    List<BaseVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1721,22 +1721,4 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
-    <select id="appVehicleQKKPList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo">
-        SELECT
-        bsov.linkNo AS vinNo,
-        bsov.`linkSid` AS vehSid,
-        bso.`customerName`,
-        bso.`contractNo`,
-        bvc.certificateState,
-        bvc.`certificateStateValue`
-        FROM anrui_buscenter.bus_sales_order_vehicle bsov
-        LEFT JOIN anrui_buscenter.bus_sales_order bso
-        ON bsov.`salesOrderSid` = bso.`sid`
-        LEFT JOIN base_vehicle_certificate bvc
-        ON bsov.`linkSid` = bvc.`vehicleSid`
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -1110,11 +1110,6 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
-    public ResultBean<List<BaseVehicleQKKPVo>> appVehicleQKKPList(BaseVehicleQKKPQuery query) {
-        return baseVehicleService.appVehicleQKKPList(query);
-    }
-
     @Override
     public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) {
         return baseVehicleService.updateByVinNo(baseVehicleUpdateQuery);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3883,41 +3883,4 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return baseMapper.vehicleQKKPPageList(page, qw);
     }
-
-    public ResultBean<List<BaseVehicleQKKPVo>> appVehicleQKKPList(BaseVehicleQKKPQuery query) {
-        ResultBean rb = ResultBean.fireFail();
-        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
-        qw.eq("bso.contractNo",query.getContractNo());
-        if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("bsov.linkNo", query.getVinNo());
-        }
-        if (query.getVinSids() != null){
-            if (query.getVinSids().size() > 0) {
-                qw.notIn("bsov.linkSid", query.getVinSids());
-            }
-        }
-        List<BaseVehicleQKKPVo> baseVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
-        List<BaseVehicleQKKPVo> baseVehicleQKKPVosNew = new ArrayList<>();
-        List<BaseVehicleQKKPTrailerVo> baseVehicleQKKPTrailerVos = new ArrayList<>();
-        for (BaseVehicleQKKPVo record : baseVehicleQKKPVos) {
-            FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
-            if (finBillVehicleDetailsVo == null){
-                baseVehicleQKKPVosNew.add(record);
-            }
-        }
-        for (BaseVehicleQKKPVo baseVehicleQKKPVo : baseVehicleQKKPVosNew) {
-            TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(),baseVehicleQKKPVo.getContractNo()).getData();
-            List<TrailerVo> trailerVos = data.getList();
-            if (trailerVos != null && trailerVos.size() > 0){
-                for (TrailerVo trailerVo : trailerVos) {
-                    BaseVehicleQKKPTrailerVo baseVehicleQKKPTrailerVo = new BaseVehicleQKKPTrailerVo();
-                    baseVehicleQKKPTrailerVo.setVinNo(baseVehicleQKKPVo.getVinNo());
-                    baseVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
-                    baseVehicleQKKPTrailerVos.add(baseVehicleQKKPTrailerVo);
-                }
-            }
-            baseVehicleQKKPVo.setTrailers(baseVehicleQKKPTrailerVos);
-        }
-        return rb.success().setData(baseVehicleQKKPVos);
-    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2641,13 +2641,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
 
     public IPage<ContractPageVo> getApprovalContractList(PagerQuery<ContractPageQuery> query) {
         ContractPageQuery params = query.getParams();
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
-        String orgPath = params.getOrgPath();
-        String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
         QueryWrapper<ContractPageVo> qw = new QueryWrapper<>();
         if (params.getStateType() == 2){
-            qw.eq("staffSid",sysUserVo.getStaffSid());
-            qw.eq("orgSid",deptSid);
+            ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(),params.getOrgPath());
+            if(!busList.getData().isEmpty()){
+                qw.in("busSid",busList);
+            }
             if (StringUtils.isNotBlank(params.getName())){
                 qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
             }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -309,4 +309,9 @@ public interface BusSalesOrderFeign {
     @GetMapping("/selectBusinessSid")
     @ResponseBody
     ResultBean<List<String>> selectBusinessSid(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("欠款开票三方金融-外部金融已审核通过的业务sid")
+    @GetMapping("/selectBusinessSidByQKKP")
+    @ResponseBody
+    ResultBean<List<String>> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -79,4 +79,8 @@ public interface BusSalesOrderVehicleFeign {
     @GetMapping("/fetchBySalesOrderVehiclerSid/{busVinSid}")
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> fetchBySalesOrderVehiclerSid(@PathVariable("busVinSid")String busVinSid);
+
+    @ApiOperation("移动端-欠款开票选择车辆分页列表")
+    @PostMapping("/appVehicleQKKPList")
+    ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -73,4 +73,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(BusVehicleQKKPQuery query) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/22 8:49
+ * @Description
+ */
+@Data
+public class BusVehicleQKKPQuery implements Query {
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+    @ApiModelProperty(value = "车辆sid")
+    private List<String> vinSids;
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/22 8:49
+ * @Description
+ */
+@Data
+public class BusVehicleQKKPTrailerVo implements Vo {
+
+    @ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/22 8:49
+ * @Description
+ */
+@Data
+public class BusVehicleQKKPVo implements Vo {
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+    @ApiModelProperty("合格证状态key")
+    private String certificateState; // 合格证状态key
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty(value = "挂车信息")
+    private List<BusVehicleQKKPTrailerVo> trailers;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -366,4 +366,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<List<String>> selectBusinessSid(String userSid, String orgPath) {
         return busSalesOrderService.selectBusinessSid(userSid,orgPath);
     }
+
+    @Override
+    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
+        return busSalesOrderService.selectBusinessSidByQKKP(userSid,orgPath);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6295,4 +6295,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         stringList.removeAll(Collections.singleton(null));
         return rb.success().setData(stringList);
     }
+
+    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid);
+        stringList.removeAll(Collections.singleton(null));
+        List<String> busSids = new ArrayList<>();
+        for (String orderSid : stringList) {
+            SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(orderSid).getData();
+            if ("02".equals(solutionsDetailsVo.getTypeKey())){
+                busSids.add(orderSid);
+            }
+        }
+        return rb.success().setData(busSids);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -25,11 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -109,4 +113,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid);
 
     List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
+
+    List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -44,7 +44,7 @@
     </select>
 
     <select id="selectListBySid" resultType="java.lang.String">
-        select RIGHT(linkNo, 8) as linkNo
+        select RIGHT (linkNo, 8) as linkNo
         from bus_sales_order_vehicle
         where salesOrderSid = #{sid}
     </select>
@@ -82,7 +82,7 @@
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_sales_order_vehicle bv
-                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractNo}
           and bv.linkSid = #{vinSid}
     </select>
@@ -91,7 +91,24 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_delivered bd
-                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
-        where bd.contractNo = #{contractNo} and bd.state = 1 and length(bv.linkSid)>0
+                     left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
+        where bd.contractNo = #{contractNo}
+          and bd.state = 1
+          and length(bv.linkSid) > 0
+    </select>
+
+    <select id="appVehicleQKKPList" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo">
+        SELECT bsov.linkNo AS vinNo,
+        bsov.`linkSid` AS vehSid,
+        bso.`customerName`,
+        bso.`contractNo`,
+        bvc.certificateState,
+        bvc.`certificateStateValue`
+        FROM bus_sales_order_vehicle bsov
+        LEFT JOIN bus_sales_order bso
+        ON bsov.`salesOrderSid` = bso.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPQuery;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,9 +82,13 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
 
     @Override
     public ResultBean<BusSalesOrderVehicle> fetchBySalesOrderVehiclerSid(String busVinSid) {
-
         return busSalesOrderVehicleService.fetchByBusSalesOrderSid(busVinSid);
     }
 
+    @Override
+    public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(BusVehicleQKKPQuery query) {
+        return busSalesOrderVehicleService.appVehicleQKKPList(query);
+    }
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -26,21 +26,28 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
+import com.yxt.anrui.base.api.basetrailer.TrailerVo;
+import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPTrailerVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -64,6 +71,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private BaseVehicleFeign baseVehicleFeign;
     @Autowired
     private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BaseTrailerFeign baseTrailerFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -234,4 +243,33 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicle> selectListByOrderSid(String saleOrderSid) {
         return baseMapper.selectByOrderSid(saleOrderSid);
     }
+
+    public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(BusVehicleQKKPQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        qw.eq("bso.contractNo",query.getContractNo());
+        if (query.getVinSids() != null){
+            if (query.getVinSids().size() > 0) {
+                qw.notIn("bsov.linkSid", query.getVinSids());
+            }
+        }
+        List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
+        List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
+        for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) {
+            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())){
+                TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
+                List<TrailerVo> trailerVos = traliveredVo.getList();
+                if (trailerVos != null && trailerVos.size() > 0){
+                    for (TrailerVo trailerVo : trailerVos) {
+                        BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo();
+                        busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo());
+                        busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                        busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo);
+                    }
+                }
+            }
+            busVehicleQKKPVo.setTrailers(busVehicleQKKPTrailerVos);
+        }
+        return rb.success().setData(busVehicleQKKPVos);
+    }
 }