修改客户账单列表3

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