修改车辆入库申请、销售申请、交回车辆台账中换算期数

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

@@ -74,4 +74,6 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreRepo
     LoanRestoreReportCarInfo jkCarInfo(String saleVehSid);
 
     String getDqyqje2(String saleVehSid);
+
+    String getYqjehsqs2(String saleVehSid);
 }

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

@@ -277,4 +277,47 @@
 		GROUP BY ss.busVinSid
 
 	</select>
+
+	<select id="getYqjehsqs2" resultType="java.lang.String">
+		SELECT
+		ROUND(
+		(
+		SUM(ss.yq_total)
+		+ COALESCE(lbpv_sum.bankBeInter_sum, 0)
+		+ COALESCE(lfd_sum.fund_sum, 0)
+		) / MAX(ss.qjyh), 1
+		) AS yqjehsqs
+		FROM (
+		SELECT
+		lrpd.sid,
+		lrpd.busVinSid,
+		(lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total,
+		COALESCE(lrs.mainMidRepay, 0) + COALESCE(lrs.otherMidRepay, 0) AS qjyh
+		FROM loan_repayment_plan_details lrpd
+		LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid
+		LEFT JOIN loan_repayment_schedule lrs ON lrpd.scheduleSid = lrs.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

@@ -710,7 +710,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         String yhjehsqs = baseMapper.getYhjehsqs(saleVehSid);
         alrepaidAndArrVo.setAlRepaidMoneyConPeriod(yhjehsqs);
         //逾期金额换算期数
-        String yqjehsqs = baseMapper.getYqjehsqs(saleVehSid);
+        String yqjehsqs = baseMapper.getYqjehsqs2(saleVehSid);
         alrepaidAndArrVo.setBeOverdueMoneyAndPeriod(yqjehsqs);
         return alrepaidAndArrVo;
     }