修改

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;

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("融资付款开通日期")

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("融资付款开通日期")

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(付款申请平仓) <br/>
- * File: FinPaymentapplyEveDto.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto <br/>
- * Description: 付款申请-平仓 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 11:20:11 <br/>
- *
- * @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("融资付款开通日期")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -96,37 +96,37 @@
 
     <select id="getSelectVinsList" resultType="com.yxt.anrui.fin.api.finbillapplication.PcSelBillVinNoPageVo">
         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,
-        bv.`linkNo` AS vin,
-        bv.`linkSid` AS vinSid,
-        bc.`certificateState` AS certificateStateKey,
-        bc.`certificateStateValue` AS certificateState,
-        bo.`purchaseSystemSid`,
-        bm.`modelName`,
-        bm.`modelSid`,
-        bo.`oneBillMoney` AS kpMoney,
+        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,
+        bv.linkNo AS vin,
+        bv.linkSid AS vinSid,
+        bc.certificateState AS certificateStateKey,
+        bc.certificateStateValue AS certificateState,
+        bo.purchaseSystemSid,
+        bm.modelName,
+        bm.modelSid,
+        bo.oneBillMoney AS kpMoney,
         bo.billingTypeKey AS invoiceTypeKey,
         bo.billingType AS invoiceType,
         bv.borrowerSid
         FROM
-        anrui_buscenter.`bus_sales_order_vehicle` bv
-        JOIN anrui_buscenter.`bus_sales_order` bo
-        ON bv.`salesOrderSid` = bo.`sid`
+        anrui_buscenter.bus_sales_order_vehicle bv
+        JOIN anrui_buscenter.bus_sales_order bo
+        ON bv.salesOrderSid = bo.sid
         JOIN anrui_base.base_vehicle_state bs
-        ON bv.`sid` = bs.`busSid`
-        JOIN anrui_base.`base_vehicle_certificate` bc
-        ON bv.`linkSid` = bc.`vehicleSid`
-        JOIN anrui_buscenter.`bus_sales_order_model` bm
-        ON bv.`salesOrderSid` = bm.`salesOrderSid`
+        ON bv.sid = bs.busSid
+        JOIN anrui_base.base_vehicle_certificate bc
+        ON bv.linkSid = bc.vehicleSid
+        JOIN anrui_buscenter.bus_sales_order_model bm
+        ON bv.salesOrderSid = bm.salesOrderSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -153,45 +153,45 @@
 
     <select id="selectByContractNos" resultType="com.yxt.anrui.fin.api.finbillapplication.BillApplicationIInfoVoss">
         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}
     </select>
 
     <select id="selectByBus" resultType="com.yxt.anrui.fin.api.finbillapplication.VinListVos">
         SELECT DISTINCT
-            RIGHT(bv.`linkNo`, 8) AS vin,
-            bv.`linkSid` AS vinSid,
-            bc.`certificateState` AS certificateStateKey,
-            bc.`certificateStateValue` AS certificateState,
-            lr.`capCarefulResult` AS xSState
+            RIGHT(bv.linkNo, 8) AS vin,
+            bv.linkSid AS vinSid,
+            bc.certificateState AS certificateStateKey,
+            bc.certificateStateValue AS certificateState,
+            lr.capCarefulResult AS xSState
         FROM
-            anrui_buscenter.`bus_sales_order_vehicle` bv
-                JOIN anrui_buscenter.`bus_sales_order` bo
-                     ON bv.`salesOrderSid` = bo.`sid`
+            anrui_buscenter.bus_sales_order_vehicle bv
+                JOIN anrui_buscenter.bus_sales_order bo
+                     ON bv.salesOrderSid = bo.sid
                 JOIN anrui_base.base_vehicle_state bs
-                     ON bv.`sid` = bs.`busSid`
-                JOIN anrui_base.`base_vehicle_certificate` bc
-                     ON bv.`linkSid` = bc.`vehicleSid`
-                JOIN anrui_buscenter.`bus_sales_order_model` bm
-                     ON bv.`salesOrderSid` = bm.`salesOrderSid`
-                LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
-                    ON bv.`loanContractSid` = lr.`loanContractSid`
+                     ON bv.sid = bs.busSid
+                JOIN anrui_base.base_vehicle_certificate bc
+                     ON bv.linkSid = bc.vehicleSid
+                JOIN anrui_buscenter.bus_sales_order_model bm
+                     ON bv.salesOrderSid = bm.salesOrderSid
+                LEFT JOIN anrui_riskcenter.loan_capital_credit_result lr
+                    ON bv.loanContractSid = lr.loanContractSid
         where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
     </select>
 

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,

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<FinPaymentapplyMa
             List<AppFinPaymentapplyVehicleVo> carList = finPaymentapplyVehicleService.getCarList(sid);
             vo.setCarList(carList);
         }
+        List<FinPaymentapplyEveDetailsVo> finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(sid);
+        List<FinPaymentapplyTrailerDetailsVo> finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid);
+        List<FinPaymentapplyTopDetailsVo> finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid);
+        vo.setEveList(finPaymentapplyEveDetailsVos);
+        vo.setTrailerList(finPaymentapplyTrailerDetailsVos);
+        vo.setTopList(finPaymentapplyTopDetailsVos);
         return rb.success().setData(vo);
     }
 }

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<PaymentApplyDetailsVo> paymentList = new ArrayList<>();
     //车辆列表
     private List<PaymentApplyVehicleVo> carList = new ArrayList<>();
+
+    private List<PaymentapplyEveDetailsVo> eveList = new ArrayList<>();
+    private List<PaymentapplyTrailerDetailsVo> trailerList = new ArrayList<>();
+    private List<PaymentapplyTopDetailsVo> topList = new ArrayList<>();
 }

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; // 平仓付款金额
+
+}

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; // 销售类型
+
+}

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; // 销售类型
+
+}