优化工作

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -245,8 +245,13 @@
         FROM fin_selected_receivables_detailed fsrd
                      JOIN fin_collection_confirmation fcc
                 ON fcc.`sid` = fsrd.`collSid` AND fcc.`pushMessgae` = 1
-                     LEFT JOIN `fin_funds_carried_forward_veh` ffc
-                ON ffc.`busSid` = fsrd.`sid`
+                     LEFT JOIN (SELECT ffc.busSid,
+                                       ffc.thisUseMoney
+                                FROM fin_funds_carried_forward_veh ffc
+                                             JOIN `fin_funds_carried_forward_apply` fa
+                                        ON ffc.mainSid = fa.sid
+                                WHERE fa.`nodeState` != '终止') ffc
+                ON ffc.`busSid` = fsrd.`sid``
         WHERE fsrd.sid = #{busSid}
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -603,7 +603,12 @@
                        ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
                        ) AS reveivableMoney
         FROM fin_selected_receivables_detailed ferd
-                     LEFT JOIN `fin_funds_carried_forward_veh` ffc
+                     LEFT JOIN (SELECT ffc.busSid,
+                                       ffc.thisUseMoney
+                                FROM fin_funds_carried_forward_veh ffc
+                                             JOIN `fin_funds_carried_forward_apply` fa
+                                        ON ffc.mainSid = fa.sid
+                                WHERE fa.`nodeState` != '终止') ffc
                 ON ffc.`busSid` = ferd.`sid`
         WHERE ferd.sid = #{busSid}
     </select>