From 5e77052488365abd09f65ef5798d831a02e7dc99 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 27 Jul 2023 11:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busmaindeposit/BusMainDepositService.java |  1 +
 ...inUncollectedReceivablesDetailedMapper.xml | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 56f0a55ae5..a7dc9d447c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1882,6 +1882,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public String getUseFin(String busMainSid){
         //根据已审核通过的简易订单订金查询已款项结转通过的
         String useMainMoney = baseMapper.selectUseMainMoney(busMainSid);
+
         return null;
     }
 
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 12fde0097c..408e453a62 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
@@ -172,10 +172,21 @@
                furd.reveivableMoney,
                furd.sid                  as receivablesSid,
                (
-                   SELECT sum(subscriptionMoney)
-                   FROM fin_selected_receivables_detailed
-                   WHERE receivablesSid = furd.sid
-                     AND auditState = 3) as subscriptionMoneyAll,
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT d.receivablesSid,
+        cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
+        FROM fin_selected_receivables_detailed d
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM fin_funds_carried_forward_veh f
+        JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = 3
+        GROUP BY d.`sid`) d
+        WHERE d.receivablesSid = furd.sid) as subscriptionMoneyAll,
                (
                    SELECT group_concat(length(remarks) > 0, ',')
                    FROM fin_selected_receivables_detailed