From 2eaca2392fae792d98b67bc699421e5e86e8c969 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 14 Nov 2024 14:43:51 +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=A83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinUncollectedReceivablesDetailedMapper.xml  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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 e682be03c4..4ed7a1b314 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
@@ -839,6 +839,20 @@
     </select>
     <select id="selCustomerThreeListDetails"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.CustomerThreeListVo">
+        SELECT
+            c.sid,
+            date_format ( c.createTime, '%Y-%m-%d' ) AS collectionDate,
+            d.`subscriptionMoney` AS collectionMoney,
+            '结转' payType,
+            c.billNo
+        FROM
+            fin_selected_receivables_detailed AS d
+         LEFT JOIN `fin_funds_carried_forward_apply` AS c ON c.sid = d.collSid
+        WHERE
+            d.receivablesSid = #{receivablesSid}
+          AND (d.`auditState` = 3
+            OR d.auditState = 1)
+        UNION ALL
         SELECT
             c.sid,
             c.collectionDate,
@@ -847,7 +861,7 @@
             c.billNo
         FROM
             fin_selected_receivables_detailed AS d
-                LEFT JOIN fin_collection_confirmation AS c ON c.sid = d.collSid
+            LEFT JOIN fin_collection_confirmation AS c ON c.sid = d.collSid
         WHERE
             d.receivablesSid = #{receivablesSid}
           AND (d.`auditState` = 3