From 2d0368df337efde0bddf6fc49b89a523ac044f11 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 27 Apr 2023 10:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/commoncontract/ContractPageQuery.java | 9 +- .../commoncontract/CommonContractService.java | 6 ++ .../AppArrearsCarryInfoVo.java | 8 ++ .../busarrearscarryvehicleapply/PdfVo.java | 22 +++++ .../BusSalesOrderVehicleFeign.java | 6 ++ .../BusSalesOrderVehicleFeignFallback.java | 5 ++ .../api/bussalesordervehicle/QCarQuery.java | 5 +- .../api/bussalesordervehicle/QCarVo.java | 8 +- .../BusArrearsCarryVehicleApplyService.java | 28 ++++-- .../BusSalesOrderVehicleMapper.java | 3 + .../BusSalesOrderVehicleMapper.xml | 20 ++++- .../BusSalesOrderVehicleRest.java | 9 ++ .../BusSalesOrderVehicleService.java | 86 ++++++++++++++++--- .../arrearsTakeCar/AdvanceArrearsInfoVo.java | 9 +- 14 files changed, 199 insertions(+), 25 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java index 5eec77cf01..eabdd8f0cd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java +++ b/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; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 56912546a9..f4d4757017 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/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 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 page = PagerUtil.queryToPage(query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java index 11ad695061..86155e7a26 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java +++ b/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 gdLetter = new ArrayList<>(); @ApiModelProperty("总经理担保书") private List zjlLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书下载地址") + private String zjlLetterDownloadUrl; + @ApiModelProperty("车辆买卖合同下载地址") + private String carContractDownloadUrl; + @ApiModelProperty("欠款提车担保承诺书下载地址") + private String guaranteeLetterDownloadUrl; + @ApiModelProperty("股东会对外担保决议下载地址") + private String gdLetterDownloadUrl; @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java new file mode 100644 index 0000000000..76d0c88a79 --- /dev/null +++ b/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; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 759bd5b474..810c3815b3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/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> getCanUseCars(@RequestBody QCarQuery query); + + @ApiOperation("PC欠款提车选择车辆") + @PostMapping("/getCanUseCarsPage") + ResultBean>> getCanUseCarsPage(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index f685329d5f..240c75bc09 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/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>> getCanUseCarsPage(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java index 5b22323a7a..1647106775 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java +++ b/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 vinSids; + @ApiModelProperty("车架号检索") + private String vinNo; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java index 6d810ece69..61939cdd12 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java +++ b/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 gcList; + private List gcList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 1a4e365878..dec827ebe5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/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 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 createPdf(String sid, List vinList, String commitmentMoneyDate) { + List list = new ArrayList<>(); + //新增生成附件（新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、股东会对外担保决议） + //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、 + //回购日期发生变化，重新生成欠款提车担保承诺书 + + return list; + + } + /** * 移动端-新增欠款提车申请 * @@ -629,21 +647,21 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService adCarListVoList = dto.getVinList(); - if(adCarListVoList.isEmpty()){ + if (adCarListVoList.isEmpty()) { return rb.setMsg("请选择车辆"); } - }else{ + } else { //修改保存 } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 23e305dcf5..b7210791fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/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 appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); List getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper qw); + + IPage selectPageVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 65031b1d82..b3fee41fec 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/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 + + ${ew.sqlSegment} + and length(bv.linkSid)>0 + + + +