Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml

@@ -53,38 +53,31 @@
         v.borrowerName,
         v.vehType,
         (SELECT c.bankName FROM anrui_buscenter.bus_sales_order_loancontract as c WHERE c.sid =
-        (SELECT b.loanContractSid FROM anrui_buscenter.bus_sales_order_vehicle as b WHERE b.linkSid = v.vinSid and
-        b.borrowerSid = v.borrowerSid)) as bankName
+        (SELECT b.loanContractSid FROM anrui_buscenter.bus_sales_order_vehicle as b WHERE b.sid = v.busVinSid)) as
+        bankName
         FROM loan_return_veh_ledger as v
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
     <select id="redemptionInit" resultType="com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionInitVo">
-        SELECT a.*,
-               c.bankName,
-               c.bankContractNo,
-               c.loanContractNo
-        FROM (SELECT v.sid                                    ledgerSid,
-                     v.vinNo,
-                     v.vinSid,
-                     v.vehMark,
-                     v.vehModel,
-                     v.customer,
-                     v.vehType,
-                     v.location,
-                     v.borrowerName,
-                     (SELECT b.sid
-                      FROM anrui_buscenter.bus_sales_order_vehicle as b
-                      WHERE b.linkSid = v.vinSid
-                        and b.borrowerSid = v.borrowerSid) as busVinSid,
-                     (SELECT b.loanContractSid
-                      FROM anrui_buscenter.bus_sales_order_vehicle as b
-                      WHERE b.linkSid = v.vinSid
-                        and b.borrowerSid = v.borrowerSid) as loanContractSid
-              FROM loan_return_veh_ledger as v) a
-                 LEFT JOIN anrui_buscenter.bus_sales_order_loancontract as c ON c.sid = a.loanContractSid
-        WHERE a.ledgerSid = #{ledgerSid}
+        SELECT v.sid ledgerSid,
+               v.vinNo,
+               v.vinSid,
+               v.vehMark,
+               v.vehModel,
+               v.customer,
+               v.vehType,
+               v.location,
+               v.borrowerName,
+               v.busVinSid,
+               l.bankContractNo,
+               l.loanContractNo,
+               l.bankName
+        FROM loan_return_veh_ledger as v
+                 LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as b ON v.busVinSid = b.sid
+                 LEFT JOIN anrui_buscenter.bus_sales_order_loancontract as l ON l.sid = b.loanContractSid
+        WHERE v.sid = #{ledgerSid}
     </select>
     <select id="selTrailerByLedgerSid"
             resultType="com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionVinList">
@@ -93,12 +86,12 @@
                vehMark,
                vehType,
                vehModel
-        FROM loan_return_trailer_ledger as t
-        WHERE t.mainSid = #{ledgerSid}
+        FROM loan_return_veh_ledger as t
+        WHERE t.pSid = #{ledgerSid}
     </select>
     <select id="selTrailerByMainLedgerSid" resultType="java.lang.String">
         SELECT sid
-        FROM loan_return_trailer_ledger as t
-        WHERE t.mainSid = #{ledgerSid}
+        FROM loan_return_veh_ledger as t
+        WHERE t.pSid = #{ledgerSid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@@ -241,7 +241,8 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
         qw.eq("v.isDelete", 0);
         qw.orderByDesc("v.createTime");
         qw.eq("v.stockState", "库存");
-        qw.eq("disposal", "未处置");
+        qw.eq("v.disposal", "未处置");
+        qw.eq("v.vehType","主车");
         IPage<VinListVo> pagging = baseMapper.getVinList(page, qw);
         PagerVo<VinListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;