Merge remote-tracking branch 'origin/master'

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

@@ -297,6 +297,10 @@ 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/commoncontract/CommonContractFeign.java

@@ -239,4 +239,10 @@ public interface CommonContractFeign {
     @PostMapping("/selectByStaffSid")
     @ResponseBody
     ResultBean<PagerVo<CommonContractVo>> selectByStaffSid(@RequestBody PagerQuery<CommonContractQKQuery> query);
+
+    @ApiOperation("移动端-查询业务员名下的合同信息")
+    @PostMapping("/getApprovalContractList")
+    @ResponseBody
+    ResultBean<PagerVo<ContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<ContractPageQuery> query);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ContractPageQuery implements Query {
+
+    private static final long serialVersionUID = -1449862667407636197L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("车架号 客户名称 合同编号")
+    private String name;
+    @ApiModelProperty("状态")
+    private int stateType;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ContractPageVo implements Vo {
+
+    private static final long serialVersionUID = 907545793790278229L;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("销售订单sid")
+    private String busSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("合同审核日期")
+    private String createDate;
+}

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

@@ -501,4 +501,6 @@ 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,4 +1721,22 @@
             ${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,6 +1110,11 @@ 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,4 +3883,39 @@ 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().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/CommonContractMapper.java

@@ -97,4 +97,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
     int getToDoNum(@Param("userSid") String userSid);
 
     IPage<CommonContractVo> selectByStaffSid(IPage<CommonContract> page,@Param(Constants.WRAPPER) QueryWrapper<CommonContractVo> qw);
+
+    IPage<ContractPageVo> getApprovalContractList(IPage<ContractPageVo> page,@Param(Constants.WRAPPER) QueryWrapper<ContractPageVo> qw);
 }

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

@@ -220,4 +220,21 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getApprovalContractList" resultType="com.yxt.anrui.base.api.commoncontract.ContractPageVo">
+        SELECT
+        sid as contractSid,
+        contractNo as contractId,
+        customerSid,
+        partyA,
+        partyB as customerName,
+        createDate,
+        modelSid,
+        modelName
+        FROM
+        common_contract
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -1,14 +1,17 @@
 package com.yxt.anrui.base.biz.commoncontract;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.api.commoncontract.flowable.*;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -618,4 +621,15 @@ public class CommonContractRest implements CommonContractFeign {
     public ResultBean<PagerVo<CommonContractVo>> selectByStaffSid(PagerQuery<CommonContractQKQuery> query) {
         return commonContractService.selectByStaffSid(query);
     }
+
+    @Override
+    public ResultBean<PagerVo<ContractPageVo>> getApprovalContractList(PagerQuery<ContractPageQuery> query) {
+        if (StringUtils.isBlank(query.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<ContractPageVo> page = new PagerVo<>();
+        IPage<ContractPageVo> iPage = commonContractService.getApprovalContractList(query);
+        PagerVo<ContractPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<ContractPageVo>>().success().setData(pagerVo);
+    }
 }

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

@@ -30,6 +30,8 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
+import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
@@ -2638,4 +2640,30 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         PagerVo<CommonContractVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
+
+    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);
+        if (params.getStateType() == 2){
+            QueryWrapper<ContractPageVo> qw = new QueryWrapper<>();
+            qw.eq("staffSid",sysUserVo.getStaffSid());
+            qw.eq("orgSid",deptSid);
+            if (StringUtils.isNotBlank(params.getName())){
+                qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
+            }
+            qw.orderByDesc("createDate");
+            IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
+            IPage<ContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
+            for (ContractPageVo record : iPage.getRecords()) {
+                String createDate = record.getCreateDate();
+                DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
+                createDate = DateUtil.formatDate(dateTime);
+                record.setCreateDate(createDate);
+            }
+            return iPage;
+        }
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(安瑞基础) <br/>
  * File: CommonContractFeign.java <br/>
@@ -37,6 +39,6 @@ public interface AppRovalFeign {
     @ApiOperation("移动端-欠款开票选择车辆列表")
     @PostMapping("/getVehicleQKKPList")
     @ResponseBody
-    public ResultBean<PagerVo<AppVehicleQKKPVo>> getVehicleQKKPList(@RequestBody PagerQuery<AppVehicleQKKPQuery> pagerQuery);
+    public ResultBean<List<AppVehicleQKKPVo>> getVehicleQKKPList(@RequestBody AppVehicleQKKPQuery query);
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java

@@ -18,6 +18,4 @@ public class AppVehicleQKKPQuery implements Query {
     private String contractNo;
     @ApiModelProperty(value = "车辆sid")
     private List<String> vinSids;
-    @ApiModelProperty("车架号")
-    private String vinNo; // 车架号
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.terminal.api.autoservice.approval;
 
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerVo;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,18 +16,8 @@ import java.util.List;
 @Data
 public class AppVehicleQKKPVo 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 VinListVo vinDto;
     @ApiModelProperty(value = "挂车信息")
-    private List<AppVehicleQKKPTrailerVo> trailers;
+    private List<FinBillTrailerVo> gcList;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@@ -12,6 +12,8 @@ public class VinListVo implements Vo {
 
     @ApiModelProperty("车架号")
     private String vin;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
     @ApiModelProperty("开票类型")
     private String invoiceTypeKey;
     @ApiModelProperty("开票类型")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java

@@ -34,6 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * Project: anrui_buscenter(销售业务) <br/>
  * File: BusAdvanceGinvoiceapplyFeignFallback.java <br/>
@@ -62,7 +64,8 @@ public class AppRovalRest implements AppRovalFeign {
     }
 
     @Override
-    public ResultBean<PagerVo<AppVehicleQKKPVo>> getVehicleQKKPList(PagerQuery<AppVehicleQKKPQuery> pagerQuery) {
-        return appRovalService.getVehicleQKKPList(pagerQuery);
+    public ResultBean<List<AppVehicleQKKPVo>> getVehicleQKKPList(AppVehicleQKKPQuery query) {
+        return appRovalService.getVehicleQKKPList(query);
     }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

@@ -30,14 +30,21 @@ package com.yxt.anrui.terminal.biz.autoservice.approval;
 
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPQuery;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPTrailerVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.api.commoncontract.CommonContractQKQuery;
+import com.yxt.anrui.base.api.commoncontract.ContractPageQuery;
+import com.yxt.anrui.base.api.commoncontract.ContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.approval.AppVehicleQKKPQuery;
 import com.yxt.anrui.terminal.api.autoservice.approval.AppVehicleQKKPVo;
 import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageQuery;
 import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageVo;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -45,6 +52,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * Project: anrui_buscenter(销售业务) <br/>
@@ -65,21 +75,46 @@ public class AppRovalService {
     @Autowired
     BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
+    CommonContractFeign commonContractFeign;
+    @Autowired
     BaseVehicleFeign baseVehicleFeign;
 
     public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
         ResultBean<PagerVo<RovalContractPageVo>> rb = ResultBean.fireFail();
-        PagerQuery<AppRovalContractPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
-        ResultBean<PagerVo<AppRovalContractPageVo>> approvalContractList = busSalesOrderFeign.getApprovalContractList(pq);
+        PagerQuery<ContractPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<ContractPageVo>> approvalContractList = commonContractFeign.getApprovalContractList(pq);
         PagerVo<RovalContractPageVo> vo = CoverUtils.selectPagerVo(approvalContractList.getData());
         return rb.success().setData(vo);
     }
 
-    public ResultBean<PagerVo<AppVehicleQKKPVo>> getVehicleQKKPList(PagerQuery<AppVehicleQKKPQuery> pagerQuery) {
-        ResultBean<PagerVo<AppVehicleQKKPVo>> rb = ResultBean.fireFail();
-        PagerQuery<BaseVehicleQKKPQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
-        ResultBean<PagerVo<BaseVehicleQKKPVo>> pagerVoResultBean = baseVehicleFeign.vehicleQKKPList(pq);
-        PagerVo<AppVehicleQKKPVo> vo = CoverUtils.selectPagerVo(pagerVoResultBean.getData());
-        return rb.success().setData(vo);
+    public ResultBean<List<AppVehicleQKKPVo>> getVehicleQKKPList(AppVehicleQKKPQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AppVehicleQKKPVo> appVehicleQKKPVos = new ArrayList<>();
+        BaseVehicleQKKPQuery baseVehicleQKKPQuery = new BaseVehicleQKKPQuery();
+        baseVehicleQKKPQuery.setContractNo(query.getContractNo());
+        baseVehicleQKKPQuery.setVinSids(query.getVinSids());
+        List<BaseVehicleQKKPVo> baseVehicleQKKPVos = baseVehicleFeign.appVehicleQKKPList(baseVehicleQKKPQuery).getData();
+        for (BaseVehicleQKKPVo baseVehicleQKKPVo : baseVehicleQKKPVos) {
+            AppVehicleQKKPVo appVehicleQKKPVo = new AppVehicleQKKPVo();
+            VinListVo vinListVo = new VinListVo();
+            vinListVo.setVin(baseVehicleQKKPVo.getVinNo());
+            vinListVo.setVinSid(baseVehicleQKKPVo.getVehSid());
+            vinListVo.setCertificateStateKey(baseVehicleQKKPVo.getCertificateState());
+            vinListVo.setCertificateState(baseVehicleQKKPVo.getCertificateStateValue());
+            List<BaseVehicleQKKPTrailerVo> trailers = baseVehicleQKKPVo.getTrailers();
+            ArrayList<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
+            if (trailers != null){
+                for (BaseVehicleQKKPTrailerVo trailer : trailers) {
+                    FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
+                    finBillTrailerVo.setVinNo(trailer.getVinNo());
+                    finBillTrailerVo.setGcVinNo(trailer.getGcVinNo());
+                    finBillTrailerVos.add(finBillTrailerVo);
+                }
+            }
+            appVehicleQKKPVo.setVinDto(vinListVo);
+            appVehicleQKKPVo.setGcList(finBillTrailerVos);
+            appVehicleQKKPVos.add(appVehicleQKKPVo);
+        }
+        return rb.success().setData(appVehicleQKKPVos);
     }
 }