diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java index b521ce5ee8..542388bbfc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java @@ -25,6 +25,7 @@ public class AppFinPaymentApplyVo implements Vo { //申请人 private String name; //款项类别 + private String costTypeKey; private String costTypeValue; //付款单位名称 private String payCompany; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java index 39ff028f1f..3a82f9a607 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java @@ -40,6 +40,8 @@ public class FinPaymentapplyEve extends BaseEntity { @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid + @ApiModelProperty("平仓款sid") + private String eveSid; @ApiModelProperty("平仓款名称") private String costTitleValue; // 平仓款名称 @ApiModelProperty("融资付款开通日期") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java index f4ce2aaebf..8cc9b48aa8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java @@ -26,11 +26,9 @@ package com.yxt.anrui.fin.api.finpaymentapplyeve; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; @Data @@ -43,6 +41,8 @@ public class FinPaymentapplyEveDetailsVo implements Vo { private String remarks; @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid + @ApiModelProperty("平仓款sid") + private String eveSid; @ApiModelProperty("平仓款名称") private String costTitleValue; // 平仓款名称 @ApiModelProperty("融资付款开通日期") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java index acced7a426..80ca0fab3e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java @@ -25,28 +25,12 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentapplyeve; - import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; -/** - * Project: anrui-fin(付款申请平仓)
- * File: FinPaymentapplyEveDto.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto
- * Description: 付款申请-平仓 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 11:20:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "付款申请-平仓 数据传输对象", description = "付款申请-平仓 数据传输对象") public class FinPaymentapplyEveDto implements Dto { @@ -57,6 +41,8 @@ public class FinPaymentapplyEveDto implements Dto { private String remarks; @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid + @ApiModelProperty("平仓款sid") + private String eveSid; @ApiModelProperty("平仓款名称") private String costTitleValue; // 平仓款名称 @ApiModelProperty("融资付款开通日期") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 001c8cd160..bff71af7c0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -96,37 +96,37 @@ SELECT DISTINCT - bo.`sid` AS busSalesOrderSid, - bo.`payTypeKey` AS saleTypeKey, - bo.`payType` AS saleType, - bo.`contractNo` AS contractId, - bo.`staffSid`, - bo.`staffName` AS sellerName, - bo.`orgSid` AS staffDeptSid, - bo.`orgName` AS sellerDept, - bo.`customerSid`, - bo.`customerName` AS NAME, - bo.`purchaseSystemSid`, - bm.`modelName`, - bm.`modelSid`, - if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS invoiceMoney - FROM anrui_buscenter.`bus_sales_order` bo - JOIN anrui_buscenter.`bus_sales_order_model` bm - ON bo.`sid` = bm.`salesOrderSid` + bo.sid AS busSalesOrderSid, + bo.payTypeKey AS saleTypeKey, + bo.payType AS saleType, + bo.contractNo AS contractId, + bo.staffSid, + bo.staffName AS sellerName, + bo.orgSid AS staffDeptSid, + bo.orgName AS sellerDept, + bo.customerSid, + bo.customerName AS NAME, + bo.purchaseSystemSid, + bm.modelName, + bm.modelSid, + if(bo.payTypeKey =1,bo.oneBillMoney,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS invoiceMoney + FROM anrui_buscenter.bus_sales_order bo + JOIN anrui_buscenter.bus_sales_order_model bm + ON bo.sid = bm.salesOrderSid where bo.contractNo = #{contractId} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index 5c465e8618..a9a8e572b9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -129,6 +129,7 @@ select DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, fp.createBySid, fp.name, + fp.costTypeKey, fp.costTypeValue, fp.payCompany, fp.remarks, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 461fedf25d..898b4272ae 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -1119,6 +1119,12 @@ public class FinPaymentapplyService extends MybatisBaseService carList = finPaymentapplyVehicleService.getCarList(sid); vo.setCarList(carList); } + List finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(sid); + List finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid); + List finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid); + vo.setEveList(finPaymentapplyEveDetailsVos); + vo.setTrailerList(finPaymentapplyTrailerDetailsVos); + vo.setTopList(finPaymentapplyTopDetailsVos); return rb.success().setData(vo); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java index 7506094663..6aef10e26c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java @@ -38,6 +38,8 @@ public class PaymentApplyVo implements Vo { @ApiModelProperty("款项范围") private String costRangeValue; //款项类别 + @JsonProperty("paymentTypeKey") + private String costTypeKey; @JsonProperty("paymentType") private String costTypeValue; //付款单位名称 @@ -65,4 +67,8 @@ public class PaymentApplyVo implements Vo { private List paymentList = new ArrayList<>(); //车辆列表 private List carList = new ArrayList<>(); + + private List eveList = new ArrayList<>(); + private List trailerList = new ArrayList<>(); + private List topList = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyEveDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyEveDetailsVo.java new file mode 100644 index 0000000000..ac748f0b28 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyEveDetailsVo.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "付款申请-平仓 视图数据详情", description = "付款申请-平仓 视图数据详情") +public class PaymentapplyEveDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("付款申请sid") + private String applySid; // 付款申请sid + @ApiModelProperty("平仓款名称") + private String costTitleValue; // 平仓款名称 + @ApiModelProperty("融资付款开通日期") + private String openDate; // 融资付款开通日期 + @ApiModelProperty("期数") + private String period; // 期数 + @ApiModelProperty("付款方式Key") + private String payWayKey; // 付款方式Key + @ApiModelProperty("付款方式Value") + private String payWayValue; // 付款方式Value + @ApiModelProperty("收款单位名称") + private String receiveCompany; // 收款单位名称 + @ApiModelProperty("收款银行账号") + private String receivingAccount; // 收款银行账号 + @ApiModelProperty("开户行") + private String bank; // 开户行 + @ApiModelProperty("平仓付款金额") + private BigDecimal exePayPrice; // 平仓付款金额 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTopDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTopDetailsVo.java new file mode 100644 index 0000000000..5912161519 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTopDetailsVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "付款申请上装 视图数据详情", description = "付款申请上装 视图数据详情") +public class PaymentapplyTopDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("付款申请sid") + private String applySid; // 付款申请sid + @ApiModelProperty("上装名称") + private String installNameValue; // 上装名称 + @ApiModelProperty("货箱内部尺寸") + private String size; // 货箱内部尺寸 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("上装sid") + private String topSid; // 上装sid + @ApiModelProperty("箱体颜色") + private String color; // 箱体颜色 + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; // 厂家结算价 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("车型别名") + private String vehModel; // 车型别名 + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("销售订单号") + private String saleOrderNo; // 销售订单号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售类型") + private String payType; // 销售类型 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTrailerDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTrailerDetailsVo.java new file mode 100644 index 0000000000..4eaf23d823 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTrailerDetailsVo.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "付款申请挂车 视图数据详情", description = "付款申请挂车 视图数据详情") +public class PaymentapplyTrailerDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("付款申请sid") + private String applySid; // 付款申请sid + @ApiModelProperty("挂车名称") + private String trailerTypeValue; // 挂车名称 + @ApiModelProperty("外观尺寸") + private String size; // 外观尺寸 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("挂车sid") + private String trailerSid; // 挂车sid + @ApiModelProperty("箱体颜色") + private String color; // 箱体颜色 + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; // 厂家结算价 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("车型别名") + private String vehModel; // 车型别名 + @ApiModelProperty("主车车架号") + private String zcVinNo; // 主车车架号 + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("销售订单号") + private String saleOrderNo; // 销售订单号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售类型") + private String payType; // 销售类型 + +} \ No newline at end of file