修改

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

@@ -11,10 +11,15 @@ public class ContractPageQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-    @ApiModelProperty("车架号 客户名称 合同编号")
+    @ApiModelProperty("app车架号 客户名称 合同编号")
     private String name;
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态:1欠款提车，2欠款开票")
     private int stateType;
     @ApiModelProperty("组织全路径")
     private String orgPath;
+
+    @ApiModelProperty("pc客户名称")
+    private String customerName;
+    @ApiModelProperty("pc合同编号")
+    private String contractNo;
 }

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

@@ -2663,6 +2663,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             if (StringUtils.isNotBlank(params.getName())){
                 qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
             }
+            if(StringUtils.isNotBlank(params.getContractNo())){
+                qw.like("contractNo", params.getContractNo());
+            }
+            if(StringUtils.isNotBlank(params.getCustomerName())){
+                qw.like("partyB",params.getCustomerName());
+            }
             qw.orderByDesc("createDate");
         }
         IPage<ContractPageVo> page = PagerUtil.queryToPage(query);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@@ -116,6 +116,14 @@ public class AppArrearsCarryInfoVo implements Vo {
     private List<String> gdLetter = new ArrayList<>();
     @ApiModelProperty("总经理担保书")
     private List<String> zjlLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书下载地址")
+    private String zjlLetterDownloadUrl;
+    @ApiModelProperty("车辆买卖合同下载地址")
+    private String carContractDownloadUrl;
+    @ApiModelProperty("欠款提车担保承诺书下载地址")
+    private String guaranteeLetterDownloadUrl;
+    @ApiModelProperty("股东会对外担保决议下载地址")
+    private String gdLetterDownloadUrl;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/27 9:35
+ * @Description
+ */
+@Data
+public class PdfVo implements Vo {
+    private static final long serialVersionUID = 8072514740863334811L;
+
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("下载地址")
+    private String downUrl;
+    @ApiModelProperty("类型")
+    private String type;
+}

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

@@ -25,7 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordervehicle;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -87,4 +89,8 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("欠款提车选择车辆")
     @PostMapping("/getCanUseCars")
     ResultBean<List<QCarVo>> getCanUseCars(@RequestBody QCarQuery query);
+
+    @ApiOperation("PC欠款提车选择车辆")
+    @PostMapping("/getCanUseCarsPage")
+    ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(@RequestBody PagerQuery<QCarQuery> pagerQuery);
 }

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

@@ -83,4 +83,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(PagerQuery<QCarQuery> pagerQuery) {
+        return null;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesordervehicle;
 
+import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,10 +12,12 @@ import java.util.List;
  * @Description
  */
 @Data
-public class QCarQuery {
+public class QCarQuery 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/QCarVo.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,8 +30,13 @@ public class QCarVo implements Vo {
     @ApiModelProperty("销售订单车辆sid")
     @JsonIgnore
     private String busVinSid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 
+    @ApiModelProperty("移动端使用")
     private AdCarListVo vinDto;
 
-    private List<GCarListVo> gcList;
+    private List<GCarListVo> gcList = new ArrayList<>();
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -556,7 +556,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             appArrearsCarryInfoVo.setContractMoney(appOrderPriceInfoVo.getTotalPrice());
             //根据合同号查询已经审核通过的总认款
             ResultBean<String> subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoney(contractNo);
-            if(subscribtAllResultBean.getData() != null){
+            if (subscribtAllResultBean.getData() != null) {
                 appArrearsCarryInfoVo.setContractCollectionMoney(subscribtAllResultBean.getData());
             }
         } else {
@@ -620,6 +620,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         return rb.success().setData(appArrearsCarryInfoVo);
     }
 
+    /**
+     * 查询车架号和回购日期与数据库中数据作对比是否发生变化，若发生变化则重新上传
+     *
+     * @param sid                 申请sid
+     * @param vinList             选择的车辆
+     * @param commitmentMoneyDate 承诺回购日期
+     * @return
+     */
+    public List<String> createPdf(String sid, List<AdCarListVo> vinList, String commitmentMoneyDate) {
+        List<String> list = new ArrayList<>();
+        //新增生成附件（新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、股东会对外担保决议）
+        //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
+        //回购日期发生变化，重新生成欠款提车担保承诺书
+
+        return list;
+
+    }
+
     /**
      * 移动端-新增欠款提车申请
      *
@@ -629,21 +647,21 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
     public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
-        if(StringUtils.isBlank(sid)){
+        if (StringUtils.isBlank(sid)) {
             //新增保存
             BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = new BusArrearsCarryVehicleApply();
-            BeanUtil.copyProperties(dto,busArrearsCarryVehicleApply,"sid");
+            BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply, "sid");
             busArrearsCarryVehicleApply.setOrgSidPath(dto.getOrgPath());
             busArrearsCarryVehicleApply.setCreateBySid(dto.getUserSid());
 
             //车辆
             List<AdCarListVo> adCarListVoList = dto.getVinList();
-            if(adCarListVoList.isEmpty()){
+            if (adCarListVoList.isEmpty()) {
                 return rb.setMsg("请选择车辆");
             }
 
 
-        }else{
+        } else {
             //修改保存
 
         }

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

@@ -27,6 +27,7 @@ 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.metadata.IPage;
 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;
@@ -117,4 +118,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     List<QCarVo> getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper<BaseVehicle> qw);
+
+    IPage<QCarVo> selectPageVo(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

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

@@ -114,7 +114,25 @@
         select bv.linkNo as vin,
         bv.linkSid carSid,
         bm.finalPrice as price,
-        bv.sid busVinSid
+        bv.sid busVinSid,
+        bo.contractNo,
+        bo.customerName
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid
+        <where>
+            ${ew.sqlSegment}
+            and length(bv.linkSid)>0
+        </where>
+    </select>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo">
+        select bv.linkNo as vin,
+        bv.linkSid carSid,
+        bm.finalPrice as price,
+        bv.sid busVinSid,
+        bo.contractNo,
+        bo.customerName
         from bus_sales_order_vehicle bv
         left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid

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

@@ -26,7 +26,9 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -92,5 +94,12 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.getCanUseCars(query);
     }
 
+    @Override
+    public ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(PagerQuery<QCarQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<QCarVo> pv = busSalesOrderVehicleService.getCanUseCarsPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
 
 }

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

@@ -27,18 +27,17 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPTrailerVo;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
 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.*;
@@ -46,7 +45,10 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehi
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -298,6 +300,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.eq("bo.contractNo", query.getContractNo());
         }
+        if(StringUtils.isNotBlank(query.getVinNo())){
+            qw.like("bv.linkNo",query.getVinNo());
+        }
         List<QCarVo> list = baseMapper.getCanUseCars(qw);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
@@ -311,20 +316,73 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                     adCarListVo.setSubscribedAll(stringResultBean.getData());
                 }
                 List<GCarListVo> gcList = new ArrayList<>();
-                TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
-                List<TrailerVo> trailerVos = traliveredVo.getList();
-                if (!trailerVos.isEmpty()) {
-                    for (TrailerVo trailerVo : trailerVos) {
-                        GCarListVo gCarListVo = new GCarListVo();
-                        gCarListVo.setVinNo(traliveredVo.getVinNo());
-                        gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
-                        gCarListVo.setPrice(trailerVo.getDealPrice());
-                        gcList.add(gCarListVo);
+                ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo());
+                if(voResultBean.getData() != null){
+                    TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
+                    List<TrailerVo> trailerVos = traliveredVo.getList();
+                    if (!trailerVos.isEmpty()) {
+                        for (TrailerVo trailerVo : trailerVos) {
+                            GCarListVo gCarListVo = new GCarListVo();
+                            gCarListVo.setVinNo(traliveredVo.getVinNo());
+                            gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                            gCarListVo.setPrice(trailerVo.getDealPrice());
+                            gcList.add(gCarListVo);
+                        }
+                        qCarVo.setGcList(gcList);
                     }
-                    qCarVo.setGcList(gcList);
                 }
             }
         }
         return rb.success().setData(list);
     }
+
+    public PagerVo<QCarVo> getCanUseCarsPage(PagerQuery<QCarQuery> pagerQuery) {
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(pagerQuery);
+        QCarQuery params = pagerQuery.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (params.getVinSids() != null) {
+            if (params.getVinSids().size() > 0) {
+                qw.notIn("bv.linkSid", params.getVinSids());
+            }
+        }
+        if (StringUtils.isNotBlank(params.getContractNo())) {
+            qw.eq("bo.contractNo", params.getContractNo());
+        }
+        if(StringUtils.isNotBlank(params.getVinNo())){
+            qw.like("bv.linkNo",params.getVinNo());
+        }
+        IPage<QCarVo> pagging = baseMapper.selectPageVo(page,qw);
+        PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
+        List<QCarVo> list =pagging.getRecords();
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            for (int i = 0; i < list.size(); i++) {
+                QCarVo qCarVo = list.get(i);
+                AdCarListVo adCarListVo = new AdCarListVo();
+                BeanUtil.copyProperties(qCarVo, adCarListVo);
+                //查询该车辆已收款
+                ResultBean<String> stringResultBean = finSelectedReceivablesDetailedFeign.selectByBusVinSid(qCarVo.getBusVinSid());
+                if (stringResultBean.getData() != null) {
+                    adCarListVo.setSubscribedAll(stringResultBean.getData());
+                }
+                List<GCarListVo> gcList = new ArrayList<>();
+                ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo());
+                if(voResultBean.getData() != null){
+                    TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()).getData();
+                    List<TrailerVo> trailerVos = traliveredVo.getList();
+                    if (!trailerVos.isEmpty()) {
+                        for (TrailerVo trailerVo : trailerVos) {
+                            GCarListVo gCarListVo = new GCarListVo();
+                            gCarListVo.setVinNo(traliveredVo.getVinNo());
+                            gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                            gCarListVo.setPrice(trailerVo.getDealPrice());
+                            gcList.add(gCarListVo);
+                        }
+                        qCarVo.setGcList(gcList);
+                    }
+                }
+            }
+        }
+        return p;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@@ -116,7 +116,6 @@ public class AdvanceArrearsInfoVo implements Vo {
 
     @ApiModelProperty("欠款提车挂车列表")
     private List<GcCarListVo> trailersList = new ArrayList<>();
-
     @ApiModelProperty("车辆买卖合同")
     private List<String> carContract = new ArrayList<>();
     @ApiModelProperty("欠款提车担保承诺书")
@@ -125,6 +124,14 @@ public class AdvanceArrearsInfoVo implements Vo {
     private List<String> gdLetter = new ArrayList<>();
     @ApiModelProperty("总经理担保书")
     private List<String> zjlLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书下载地址")
+    private String zjlLetterDownloadUrl;
+    @ApiModelProperty("车辆买卖合同下载地址")
+    private String carContractDownloadUrl;
+    @ApiModelProperty("欠款提车担保承诺书下载地址")
+    private String guaranteeLetterDownloadUrl;
+    @ApiModelProperty("股东会对外担保决议下载地址")
+    private String gdLetterDownloadUrl;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;