优化

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;
     }
 

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)
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
-                   FROM fin_selected_receivables_detailed
+        from (SELECT d.receivablesSid,
-                   WHERE receivablesSid = furd.sid
+        cast((
-                     AND auditState = 3) as subscriptionMoneyAll,
+        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