From 29a7a01a0dd813f17c8466089bd6b911d12e608b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 14 Nov 2024 14:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...inUncollectedReceivablesDetailedMapper.xml | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
index 3cd08dba92..6e0844bf00 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
@@ -965,6 +965,28 @@
     </select>
     <select id="selexportCustomerBillExcelDetails"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerBillSummaryExportVo">
+        SELECT
+            fd.customerName,
+            fd.contractNo,
+            date_format ( c.createTime, '%Y-%m-%d' ) AS collectionDate,
+            fd.receivablesName,
+            IF(fd.kxState = '01','正常', '作废') kxState,
+            d.`subscriptionMoney`,
+            '结转' collectionTypeValue,
+            c.billNo,
+            v.linkNo vinNo,
+            fd.reveivableMoney
+        FROM
+            fin_selected_receivables_detailed AS d
+                LEFT JOIN `fin_funds_carried_forward_apply` AS c ON c.sid = d.collSid
+                LEFT JOIN fin_uncollected_receivables_detailed as fd ON d.receivablesSid = fd.sid
+                LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON fd.busVinSid = v.sid
+        WHERE
+            d.contractNo = #{contractNo}
+          AND (d.`auditState` = 3
+            OR d.auditState = 1)
+        and c.sid != ''
+        UNION ALL
         SELECT
             fd.customerName,
             fd.contractNo,
@@ -985,6 +1007,7 @@
             d.contractNo = #{contractNo}
           AND (d.`auditState` = 3
             OR d.auditState = 1)
+          and c.sid != ''
         UNION ALL
         SELECT
             *