修改车辆入库申请、销售申请、交回车辆台账中逾期金额

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java

@@ -72,4 +72,6 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreRepo
     int selectBySid(String join);
 
     LoanRestoreReportCarInfo jkCarInfo(String saleVehSid);
+
+    String getDqyqje2(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@@ -236,4 +236,45 @@
 		WHERE a1.busVinSid = #{saleVehSid}
 		GROUP BY a1.busVinSid
 	</select>
+
+	<select id="getDqyqje2" resultType="java.lang.String">
+		SELECT
+		ROUND(
+		SUM(ss.yq_total) +
+		COALESCE(lbpv_sum.bankBeInter_sum, 0) +
+		COALESCE(lfd_sum.fund_sum, 0),
+		2
+		) AS beMoney
+		FROM (
+		SELECT
+		lrpd.sid,
+		lrpd.busVinSid,
+		(lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total
+		FROM loan_repayment_plan_details lrpd
+		LEFT JOIN loan_repayment_history lrh
+		ON lrh.planDetailSid = lrpd.sid
+		WHERE lrpd.dueDate &lt;= lrpd.updateTime
+		AND lrpd.busVinSid = #{saleVehSid}
+		GROUP BY lrpd.sid
+		HAVING yq_total > 0
+		) ss
+		LEFT JOIN (
+		SELECT
+		saleVehSid,
+		SUM(bankBeInter) AS bankBeInter_sum
+		FROM loan_be_padsincere_veh
+		GROUP BY saleVehSid
+		) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
+		LEFT JOIN (
+		SELECT
+		lrpd.busVinSid,
+		SUM(lfd.fund) AS fund_sum
+		FROM loan_fund_day lfd
+		JOIN loan_repayment_plan_details lrpd ON lrpd.sid = lfd.busSid
+		WHERE lrpd.dueDate &lt;= lrpd.updateTime
+		GROUP BY lrpd.busVinSid
+		) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
+		GROUP BY ss.busVinSid
+
+	</select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -685,6 +685,36 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         return alrepaidAndArrVo;
     }
 
+
+    public AlrepaidAndArrVo getAlrepaidAndArr2(String saleVehSid) {
+        AlrepaidAndArrVo alrepaidAndArrVo = new AlrepaidAndArrVo();
+        //已还金额
+        String yhje = baseMapper.getYhje(saleVehSid);
+        alrepaidAndArrVo.setAlRepaidMoney(yhje);
+        //当前逾期金额
+        String dqyqje = baseMapper.getDqyqje2(saleVehSid);
+        alrepaidAndArrVo.setCurrentBeMoney(dqyqje);
+        //其中资金占用费
+        String qzzjzyf = baseMapper.getQzzjzyf(saleVehSid);
+        alrepaidAndArrVo.setWheFundOccMoney(qzzjzyf);
+        //未到期金额
+        String wdqje = baseMapper.getWdqje(saleVehSid);
+        alrepaidAndArrVo.setUnexpiredMoney(wdqje);
+        //总期数
+        String zqs = baseMapper.getZqs(saleVehSid);
+        alrepaidAndArrVo.setNper(zqs);
+        //当前期数
+        String dqqs = baseMapper.getDqqs(saleVehSid);
+        alrepaidAndArrVo.setCurrentPeriod(dqqs);
+        //已还金额换算期数
+        String yhjehsqs = baseMapper.getYhjehsqs(saleVehSid);
+        alrepaidAndArrVo.setAlRepaidMoneyConPeriod(yhjehsqs);
+        //逾期金额换算期数
+        String yqjehsqs = baseMapper.getYqjehsqs(saleVehSid);
+        alrepaidAndArrVo.setBeOverdueMoneyAndPeriod(yqjehsqs);
+        return alrepaidAndArrVo;
+    }
+
     public ResultBean delAllBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         //查询该sid中是否有流程不是待提交的

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

@@ -366,7 +366,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             }
             //根据交回车辆事前报备申请sid查询数据
             loanReturnInboundApplyDetailsVo = baseMapper.selectSidOne(chooseSid);
-            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(loanReturnInboundApplyDetailsVo.getBusVinSid());
+            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanReturnInboundApplyDetailsVo.getBusVinSid());
             if (alrepaidAndArrVo != null) {
                 BeanUtil.copyProperties(alrepaidAndArrVo, loanReturnInboundApplyDetailsVo);
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java

@@ -219,7 +219,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         if (!paggingRecords.isEmpty()) {
             for (LoanReturnVehLedgerVo record : pagging.getRecords()) {
                 if ("主车".equals(record.getVehType())) {
-                    AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(record.getBusVinSid());
+                    AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(record.getBusVinSid());
                     if (alrepaidAndArrVo != null) {
                         record.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
                         record.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());
@@ -250,7 +250,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         LoanReturnLedgerVo loanReturnLedgerVo = new LoanReturnLedgerVo();
         BeanUtil.copyProperties(loanReturnVehLedger, loanReturnLedgerVo);
         if ("主车".equals(loanReturnVehLedger.getVehType())) {
-            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(loanReturnVehLedger.getBusVinSid());
+            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanReturnVehLedger.getBusVinSid());
             if (alrepaidAndArrVo != null) {
                 loanReturnLedgerVo.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
                 loanReturnLedgerVo.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -879,7 +879,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                             }
                         }
                         LoanSecondarySalesCostVo loanSecondarySalesCost = new LoanSecondarySalesCostVo();
-                        AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
+                        AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
                         if (alrepaidAndArrVo != null) {
                             BeanUtil.copyProperties(alrepaidAndArrVo, loanSecondarySalesApplyDetailsVo);
                             BigDecimal bigDecimal = BigDecimal.ZERO;
@@ -938,7 +938,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                         loanSecondarySalesApplyDetailsVo.setBankContractNo(loanReturnInboundApply.getBankContractNo());
                         loanSecondarySalesApplyDetailsVo.setLocationName(loanReturnVehLedger.getLocation());
                         loanSecondarySalesApplyDetailsVo.setSalesOrderSid(loanReturnVehLedger.getSaleOrderSid());
-                        AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
+                        AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
                         if (alrepaidAndArrVo != null) {
                             BeanUtil.copyProperties(alrepaidAndArrVo, loanSecondarySalesApplyDetailsVo);
                         }