From 3ea9cf78c084d08c9023bbc2a4581ba2b0fd95ed Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 26 Jul 2023 16:37:18 +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

---
 .../biz/busdelivered/BusDeliveredMapper.java  |   3 +-
 .../biz/busdelivered/BusDeliveredMapper.xml   | 167 +++++++++++++-----
 .../biz/bussalesorder/BusSalesOrderMapper.xml |   2 +-
 .../FinFundsCarriedForwardApplyMapper.xml     |  20 +--
 .../FinSelectedReceivablesDetailedMapper.xml  | 112 ++++++------
 ...inUncollectedReceivablesDetailedMapper.xml |  40 +++--
 6 files changed, 214 insertions(+), 130 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
index 9ce3c72e8a..81c232839e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
@@ -78,7 +78,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
      * @return
      */
     IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
-    IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
 
     /**
      * 查询车架号
@@ -101,4 +100,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     List<String> selectByState();
 
     IPage<BusDeliveredVo> selectListsVos(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
+
+    IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
index 57f269701b..ded95acff0 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
@@ -65,45 +65,6 @@
         group by bd.contractNo
     </select>
 
-    <resultMap id="ListMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
-        <result column="sid" jdbcType="VARCHAR" property="sid"/>
-        <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
-        <result column="paymentMethod" jdbcType="INTEGER" property="paymentMethod"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.sysmobilemenu.SysMobileMenuListVo"
-                    select="vinList" column="contractNo">
-        </collection>
-    </resultMap>
-    <select id="getRetrievalNotLists"
-            resultMap="ListMap">
-        SELECT bd.*
-        FROM bus_delivered bd
-        left join bus_sales_order bo on bo.contractNo = bd.contractNo
-        left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
-        <where>
-            ${ew.sqlSegment}
-            <if test="name != null and name != ''">
-                and concat(IFNULL(bd.contractNo
-                , '')
-                , ifnull(bd.`name`
-                , '')) LIKE concat('%'
-                , #{name}
-                , '%')
-            </if>
-            AND (
-            SELECT
-            count(*)
-            FROM
-            bus_sales_order_vehicle bbv
-            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
-            WHERE
-            length( bbv.linkSid )> 0
-            AND bo.contractNo = bd.contractNo
-            )> 0
-        </where>
-        group by bd.contractNo
-    </select>
-
     <select id="selVinListVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
         SELECT RIGHT(bv.linkNo, 8) as vin, bd.busVinSid, bd.subscription as businessState, bv.linkSid as vinSid
         FROM bus_delivered bd
@@ -138,7 +99,7 @@
         </foreach>
     </update>
 
-    <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
+   <!-- <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
         SELECT bd.sid,
                bd.contractNo,
                bd.name,
@@ -154,7 +115,7 @@
             ${ew.sqlSegment}
               and length(bv.linkSid) > 0
         </where>
-    </select>
+    </select>-->
 
     <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
         SELECT bd.sid,
@@ -211,4 +172,128 @@
               and length(bv.linkSid) > 0 and bbv.vehicleStateValue != '出库'
         </where>
     </select>
+
+    <resultMap id="listMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
+        <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
+        <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
+                    select="vinList" column="contractNo">
+        </collection>
+    </resultMap>
+    <select id="vinList">
+        SELECT
+        bv.linkNo vin,
+        bv.linkSid vinSid,
+        bv.sid busVinSid,
+            cast(
+                    sum(
+                            furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS dblances,
+            bbv.vehicleStateValue
+        FROM
+            fin_uncollected_receivables_detailed furd
+                LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = furd.busVinSid
+                LEFT JOIN (
+                SELECT
+                    sum( dbalance ) AS dbalance,
+                    d.receivablesSid
+                FROM
+                    (
+                        SELECT
+                            d.sid,
+                            d.receivablesSid,
+                            d.`collSid`,
+                            cast((
+                                        d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 ) + COALESCE ( ffa.`useMoney`, 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
+                        FROM
+                            fin_selected_receivables_detailed d
+                                LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
+                                LEFT JOIN (
+                                SELECT
+                                    fa.sid,
+                                    ff.busSid,
+                                    ff.thisUseMoney AS useMoney
+                                FROM
+                                    fin_funds_carried_forward_apply fa
+                                        LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
+                                WHERE
+                                    fa.nodeState = '终止'
+                            ) ffa ON ffa.busSid = d.sid
+                        WHERE
+                            (d.auditState = 3 )
+                        GROUP BY
+                            d.`sid`
+                    ) d
+                GROUP BY
+                    d.receivablesSid
+            ) df ON df.receivablesSid = furd.`sid`
+                LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+        WHERE
+            bbv.vehicleStateValue != '出库'
+          AND length( bv.linkSid )> 0 and furd.contractNo = #{contractNo}
+        GROUP BY
+            furd.busVinSid
+        HAVING
+            dblances &lt;= 0
+    </select>
+    <select id="getRetrievalNotLists" resultMap="listMap">
+        SELECT
+            ds.contractNo
+        FROM
+            (
+                SELECT
+                    furd.contractNo,
+                    furd.busVinSid,
+                    cast(
+                            sum(
+                                    furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS dblances,
+                    bbv.vehicleStateValue
+                FROM
+                    fin_uncollected_receivables_detailed furd
+                        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = furd.busVinSid
+                        LEFT JOIN (
+                        SELECT
+                            sum( dbalance ) AS dbalance,
+                            d.receivablesSid
+                        FROM
+                            (
+                                SELECT
+                                    d.sid,
+                                    d.receivablesSid,
+                                    d.`collSid`,
+                                    cast((
+                                                d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 ) + COALESCE ( ffa.`useMoney`, 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
+                                FROM
+                                    fin_selected_receivables_detailed d
+                                        LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
+                                        LEFT JOIN (
+                                        SELECT
+                                            fa.sid,
+                                            ff.busSid,
+                                            ff.thisUseMoney AS useMoney
+                                        FROM
+                                            fin_funds_carried_forward_apply fa
+                                                LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
+                                        WHERE
+                                            fa.nodeState = '终止'
+                                    ) ffa ON ffa.busSid = d.sid
+                                WHERE
+                                    (d.auditState = 3 )
+                                GROUP BY
+                                    d.`sid`
+                            ) d
+                        GROUP BY
+                            d.receivablesSid
+                    ) df ON df.receivablesSid = furd.`sid`
+                        LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+                WHERE
+                    bbv.vehicleStateValue != '出库'
+                  AND length( bv.linkSid )> 0
+                GROUP BY
+                    furd.busVinSid
+                HAVING
+                    dblances &lt;= 0
+
+        ) ds
+        GROUP BY
+        ds.contractNo order by ds.contractNo desc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index 936d999861..636eaebf2e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -554,6 +554,6 @@
     </select>
 
     <select id="selectBySid" resultType="java.lang.String">
-        select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
+        select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo where bo.sid = #{sid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
index e623544120..ba12e7c7c3 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
@@ -70,20 +70,18 @@
 
     <select id="selectByBusSid" resultType="java.lang.String">
         select ifnull(sum(dbalance), 0) as subscriptionMoney
-        from (SELECT d.sid,
-        d.receivablesSid,
-        d.`collSid`,
-        d.auditState,
+        from (SELECT
         cast((
-        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
-        COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) ) AS DECIMAL(10, 2)) AS dbalance
         FROM fin_selected_receivables_detailed d
-        LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
         left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
-        LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
-        FROM fin_funds_carried_forward_apply fa
-        LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
-        WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
+        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
         and ff.busVinSid = #{busVinSid}
         GROUP BY d.`sid`) d
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
index 3158081a20..93adb25e15 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
@@ -25,42 +25,43 @@
     <select id="getPaymentDetailsList"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
         SELECT distinct furd.sid,
-                        furd.contractNo                                                             AS contractId,
-                        furd.receivablesName                                                        AS projectName,
-                        furd.customerPhone                                                          AS mobile,
-                        furd.customerName                                                           AS `name`,
+                        furd.contractNo                                                                  AS contractId,
+                        furd.receivablesName                                                             AS projectName,
+                        furd.customerPhone                                                               AS mobile,
+                        furd.customerName                                                                AS `name`,
                         furd.customerSid,
                         furd.useOrgSid,
-                        cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS receivable,
+                        COALESCE(SUM(df.dbalance), 0)                                                    AS realMoney,
+                        cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS receivable,
                         furd.contractSid,
                         if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
                            if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
-                           RIGHT(bv.linkNo, 8))                                                     as vin,
+                           RIGHT(bv.linkNo, 8))                                                          as vin,
                         furd.busVinSid,
                         furd.payType,
                         furd.payTypeKey,
-                        0                                                                           as subscribedOf,
-                        furd.sid                                                                    as receivablesSid,
-                        CURRENT_DATE()                                                              as confirmDate,
+                        0                                                                                as subscribedOf,
+                        furd.sid                                                                         as receivablesSid,
+                        CURRENT_DATE()                                                                   as confirmDate,
                         furd.purchaseSystemSid
         FROM fin_uncollected_receivables_detailed furd
                  left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
-                 LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
-                            from (SELECT d.sid,
-                                         d.receivablesSid,
-                                         d.`collSid`,
-                                         cast((
-                                                     d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
-                                                     COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
-                                  FROM fin_selected_receivables_detailed d
-                                           LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
-                                           LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
-                                                      FROM fin_funds_carried_forward_apply fa
-                                                               LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
-                                                      WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
-                                  WHERE (d.auditState = 1 OR d.auditState = 3)
-                                  GROUP BY d.`sid`) d
-                            group by d.receivablesSid
+                 LEFT JOIN (
+            SELECT d.sid,
+                   d.`receivablesSid`,
+                   (
+                       d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) 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
+               or d.auditState = 1
+            GROUP BY d.`sid`
         ) df ON df.receivablesSid = furd.`sid`
         <where>
             ${ew.sqlSegment}
@@ -77,6 +78,7 @@
             and length(furd.busVinSid)
               >0
         </where>
+        group by furd.sid
         having receivable>0
         order by furd.contractNo desc
     </select>
@@ -176,20 +178,17 @@
     <select id="selectListByVin"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
         select ifnull(sum(dbalance), 0) as subscriptionMoney
-        from (SELECT d.sid,
-                     d.receivablesSid,
-                     d.`collSid`,
-                     d.auditState,
-                     cast((
-                                 d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
-                                 COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
+        from (SELECT cast((
+            d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
               FROM fin_selected_receivables_detailed d
-                       LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
                        left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
-                       LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
-                                  FROM fin_funds_carried_forward_apply fa
-                                           LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
-                                  WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
+                       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 = #{state}
                 and ff.busVinSid = #{busVinSid}
                 and d.contractNo = #{contractNo}
@@ -303,20 +302,18 @@
 
     <select id="selectByVinSid" resultType="java.lang.String">
         select ifnull(sum(dbalance), 0) as subscriptionMoney
-        from (SELECT d.sid,
-                     d.receivablesSid,
-                     d.`collSid`,
-                     d.auditState,
-                     cast((
-                                 d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
-                                 COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
+        from (SELECT cast((
+            d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
               FROM fin_selected_receivables_detailed d
                        LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
                        left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
-                       LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
-                                  FROM fin_funds_carried_forward_apply fa
-                                           LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
-                                  WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
+                       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
                 and ff.busVinSid = #{busVinSid}
               GROUP BY d.`sid`) d
@@ -546,19 +543,18 @@
     <select id="fetchByReceivablesSid"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
         select ifnull(sum(dbalance), 0) as subscriptionMoney, d.receivablesSid
-        from (SELECT d.sid,
-                     d.receivablesSid,
-                     d.`collSid`,
-                     d.auditState,
+        from (SELECT d.receivablesSid,
                      cast((
-                                 d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
-                                 COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
+                         d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
               FROM fin_selected_receivables_detailed d
                        LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
-                       LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
-                                  FROM fin_funds_carried_forward_apply fa
-                                           LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
-                                  WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
+                       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 = #{receivablesSid}
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 ae2083c182..8dcf61c327 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
@@ -58,7 +58,8 @@
                         furd.customerName                                                           AS `customerName`,
                         furd.customerSid,
                         furd.useOrgSid,
-                        cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney,
+                        COALESCE ( SUM( df.dbalance ), 0 ) AS realMoney,
+                        cast((furd.`reveivableMoney` - COALESCE(SUM( df.dbalance ), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney,
                         furd.reveivableMoney,
                         furd.contractSid,
                         if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
@@ -71,27 +72,28 @@
                         furd.sid                                                                    as receivablesSid
         FROM fin_uncollected_receivables_detailed furd
                  left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
-                 LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
-                            from (SELECT d.sid,
-                                         d.receivablesSid,
-                                         d.`collSid`,
-                                         cast((
-                                                     d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
-                                                     COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
-                                  FROM fin_selected_receivables_detailed d
-                                           LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
-                                           LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
-                                                      FROM fin_funds_carried_forward_apply fa
-                                                               LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
-                                                      WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
-                                  WHERE (d.auditState = 1 OR d.auditState = 3)
-                                  GROUP BY d.`sid`) d
-                            group by d.receivablesSid
+                 LEFT JOIN (
+            SELECT d.sid,
+                   d.`receivablesSid`,
+                   (
+                       d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) 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
+               or d.auditState = 1
+            GROUP BY d.`sid`
         ) df ON df.receivablesSid = furd.`sid`
         <where>
             ${ew.sqlSegment}
               and length(furd.busVinSid) > 0
         </where>
+        group by furd.sid,currentReceivableMoney,furd.contractNo
         having currentReceivableMoney>0
         order by furd.contractNo desc
     </select>
@@ -213,6 +215,8 @@
     </select>
 
     <select id="selectByBusVinSid" resultType="java.lang.String">
-        select sum(reveivableMoney) from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid}
+        select sum(reveivableMoney)
+        from fin_uncollected_receivables_detailed
+        where busVinSid = #{busVinSid}
     </select>
 </mapper>
\ No newline at end of file