From 74c4801dfb2233568e11587aa22d94a4287cfb01 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 10 Aug 2023 17:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinVehicleInvoiceMapper.java               |  3 ++-
 .../FinVehicleInvoiceMapper.xml                | 11 ++++++-----
 .../FinVehicleInvoiceService.java              | 18 ++++++++++++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
index fd063e76eb..0274137916 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
@@ -69,5 +69,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
     @Update("update fin_vehicle_invoice set isTakeTicket = '是' where sid = #{sid}")
     void updateIsLPBySid(String sid);
 
-    List<FinSelectInvoiceVo> getFinSelectInvoiceVoListByBusVinSid(String busVinSid);
+    List<FinSelectInvoiceVo> getFinSelectInvoiceVoListByVinNo(String vinNo);
+
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
index 4e50e226b2..871b955a45 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
@@ -260,7 +260,7 @@
         where vehicleSid = #{vinSid}
           and contractNo = #{contractNo}
     </select>
-    <select id="getFinSelectInvoiceVoListByBusVinSid"
+    <select id="getFinSelectInvoiceVoListByVinNo"
             resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinSelectInvoiceVo">
         select fu.busVinSid,
                fu.receivablesName,
@@ -271,12 +271,13 @@
                co.collectionBankNum,
                co.receivingName,
                co.payerName,
-               co.confirmDate as collectionDate
-        FROM fin_uncollected_receivables_detailed as fu
-                 LEFT JOIN fin_selected_receivables_detailed as fs ON fu.sid = fs.receivablesSid
+               co.confirmDate       as collectionDate
+        FROM fin_selected_receivables_detailed as fs
+                 LEFT JOIN fin_uncollected_receivables_detailed as fu ON fu.sid = fs.receivablesSid
                  LEFT JOIN fin_collection_confirmation as co ON fs.collSid = co.sid
-        WHERE fu.busVinSid = #{busVinSid}
+        WHERE fs.VIN = #{vinNo}
           and fs.auditState = '3'
         ORDER BY co.createTime DESC
     </select>
+
 </mapper>
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
index 0ae4d5bfc2..361ff19926 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
@@ -617,10 +617,20 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
             //根据销售订单车辆查询款项情况
             ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedService.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid());
             if (receiveInvoiceVoResultBean.getData() != null) {
-                List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByBusVinSid(busSalesOrderVehicle.getSid());
-                finSelectVoList.removeAll(Collections.singleton(null));
-                if (!finSelectVoList.isEmpty()) {
-                    deliveredFinVo.setFinSelectVoList(finSelectVoList);
+                FinVehicleInvoice invoice = selectByVinAndContractNo(vinSid, contractNo).getData();
+                if (null != invoice) {
+                    if (StringUtils.isNotBlank(invoice.getVIN())) {
+                        List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByVinNo(invoice.getVIN());
+                        finSelectVoList.removeAll(Collections.singleton(null));
+                        if (!finSelectVoList.isEmpty()) {
+                            for (FinSelectInvoiceVo finSelectInvoiceVo : finSelectVoList) {
+                                if (StringUtils.isBlank(finSelectInvoiceVo.getCollectionTypeValue())) {
+                                    finSelectInvoiceVo.setCollectionTypeValue("款项结转");
+                                }
+                            }
+                            deliveredFinVo.setFinSelectVoList(finSelectVoList);
+                        }
+                    }
                 }
                 InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
                 if (invoiceVo != null) {