修改

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml

@@ -79,6 +79,7 @@
         from loan_return_veh_ledger
         where useOrgSid = #{useOrgSid}
           and vehType = '主车'
+          and stockStateKey = '0001'
     </select>
 
     <select id="selectSidOne"

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -720,7 +720,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         //2、未到期欠款 = 该车的还款明细中应还日期在当月之后的未还金额之和
         //3、本金 = 该车的还款明细中是否转累欠状态为否1的且应还日期是本月的未还金额
         //4、扣回车辆 = 累欠+未到期欠款+本金
-        
+
         //应收贷款车欠款_待处理欠款_扣回车辆
         BigDecimal all = BigDecimal.ZERO;
         //应收贷款车欠款_到期欠款_累欠
@@ -731,25 +731,25 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         BigDecimal bjMoney = BigDecimal.ZERO;
         String lq = loanRepaymentPlanDetailsService.getYqLq(loanReturnInboundApply.getBusVinSid());
         lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
-        if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+        if ("1".equals(busSalesOrderVehicle.getRepoState().toString())) {//已回购
             //查询回购的资方费用
             LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
-            if(loanRepurchaseApply != null){
+            if (loanRepurchaseApply != null) {
                 LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
-                if(loanRepurchaseCost != null){
+                if (loanRepurchaseCost != null) {
                     //合同违约金
                     BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
-                    if(bankContractLiquidated != null){
+                    if (bankContractLiquidated != null) {
                         lqMoney = lqMoney.add(bankContractLiquidated);
                     }
                     //资方名义价
                     BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
-                    if(bankNominalPrice != null){
+                    if (bankNominalPrice != null) {
                         lqMoney = lqMoney.add(bankNominalPrice);
                     }
                     //资方其他费用
                     BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
-                    if(bankOtherReceivable != null){
+                    if (bankOtherReceivable != null) {
                         lqMoney = lqMoney.add(bankOtherReceivable);
                     }
                 }
@@ -992,7 +992,6 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
                 busVinSid.removeAll(Collections.singleton(null));
             }
             qw.eq("la.nodeState", "已办结");
-
         }
         IPage<LoanReturnInboundApply> page = PagerUtil.queryToPage(pq);
         IPage<ReturnInboundVo> pagging = baseMapper.getInboundList(page, qw, busVinSid);