优化结清申请当前未到期月还

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@@ -74,9 +74,10 @@
         ld.sid
         FROM
         anrui_buscenter.bus_sales_order_loancontract ld
-        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.salesOrderSid = ld.salesOrderSid
+        LEFT JOIN anrui_buscenter.bus_sales_order_borrower AS br ON br.sid = ld.borrowerSid
-        LEFT JOIN anrui_buscenter.bus_sales_order_borrower as br ON br.sid = bv.borrowerSid
+        LEFT JOIN anrui_buscenter.bus_sales_order AS bs ON bs.sid = ld.salesOrderSid
-        LEFT JOIN anrui_buscenter.bus_sales_order as bs ON bs.sid = ld.salesOrderSid
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.salesOrderSid = bs.sid
+        AND bv.borrowerSid = br.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -143,18 +144,66 @@ FROM (
     </select>
 
     <select id="selectGsDqWdq" resultType="java.lang.String">
-        SELECT IFNULL(SUM(lrpd.`dueMoney`), 0)
+        SELECT
-        FROM loan_repayment_plan_details lrpd
+            IFNULL(
-        WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt;= #{settingDate}
+                    (
-          and DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d')
+                            a.dueMoney - IFNULL((
-          AND lrpd.`busVinSid` = #{busVinSid}
+                                                    SELECT
+                                                        SUM(
+                                                                IFNULL( h.actualMoney, 0 ))
+                                                    FROM
+                                                        loan_repayment_history AS h
+                                                    WHERE
+                                                        h.planDetailSid = a.sid
+                                                      AND h.updateState = '1'
+                                                ),
+                                                0
+                            )),
+                    0
+                ) AS outstandingMoney
+        FROM
+            (
+                SELECT
+                    lrpd.`dueMoney`,
+                    lrpd.sid
+                FROM
+                    loan_repayment_plan_details lrpd
+                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt;= #{settingDate}
+                  and DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d')
+                  AND lrpd.`busVinSid` = #{busVinSid}
+            ) a
     </select>
 
     <select id="selectGsWdq" resultType="java.lang.String">
-        SELECT IFNULL(SUM(lrpd.`dueMoney`), 0)
+        SELECT IFNULL(SUM(b.outstandingMoney),0) FROM
-        FROM loan_repayment_plan_details lrpd
+            (SELECT
-        WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d')
+                 IFNULL(
-          AND lrpd.`busVinSid` = #{busVinSid}
+                         (
+                                 a.dueMoney - IFNULL((
+                                                         SELECT
+                                                             SUM(
+                                                                     IFNULL( h.actualMoney, 0 ))
+                                                         FROM
+                                                             loan_repayment_history AS h
+                                                         WHERE
+                                                             h.planDetailSid = a.sid
+                                                           AND h.updateState = '1'
+                                                     ),
+                                                     0
+                                 )),
+                         0
+                     ) AS outstandingMoney
+             FROM
+                 (
+                     SELECT
+                         lrpd.`dueMoney`,
+                         lrpd.sid
+                     FROM
+                         loan_repayment_plan_details lrpd
+                     WHERE
+                             DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt; DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d')
+                       AND lrpd.`busVinSid` = #{busVinSid}
+                 ) a) b
     </select>
     <select id="selvehOverdueCount" resultType="java.lang.Integer">
         SELECT COUNT(*)

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java

@@ -128,6 +128,7 @@ public class LoanSettleVehicleService extends MybatisBaseService<LoanSettleVehic
                 }
             }
             qw.eq("lv.state", 1);
+            qw.orderByDesc("lv.settingDate");
         }
         IPage<LoanSettleVehicle> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanSettleVehicleVo> pagging = baseMapper.selectPageVo(page, qw);