targetRepayment与逾期相关字段业务拆分

src/main/resources/cn/quantgroup/report/mapper/baihang/RepaymentLoanInfoMapper.xml

@@ -1047,7 +1047,7 @@
              ,date(DATE_sub(if(DATEDIFF(a.next_deadline,a.repaid_at)>1,a.deadline,h.max_deadline),INTERVAL 1 second)) targetRepaymentDate
              ,DATE_FORMAT(a.repaid_at,'%Y-%m-%dT%H:%i:%S') realRepaymentDate
              ,j.required_repayment plannedPayment
-             ,f.yqze+sum(a.required_repayment) targetRepayment
+             ,f.trr+sum(a.required_repayment) targetRepayment
              ,sum(a.required_repayment) realRepayment
              ,case when f.yqze=0 then ''
             else if(f.min_deadline is null,'D1',concat('D',DATEDIFF(a.repaid_at,f.min_deadline)+1)) end overdueStatus
@@ -1077,7 +1077,8 @@
         left join xyqb.apply_quota_record d on c.order_no=d.order_no
         left join (
         select a.loan_application_history_id,a.term_no
-        ,sum(if((a.repayment_status !=3 or (a.repayment_status =3 and (a.repaid_at>=c.deadline or TO_DAYS(a.repaid_at)=TO_DAYS(date(DATE_sub(c.deadline,INTERVAL 1 second)))))) and a.deadline <= c.deadline,c.required_repayment,0)) yqze
+        ,sum(if((a.repayment_status !=3 or (a.repayment_status =3 and (a.repaid_at>=c.deadline or TO_DAYS(a.repaid_at)=TO_DAYS(date(DATE_sub(c.deadline,INTERVAL 1 second)))))) and a.deadline <= c.deadline,c.required_repayment,0)) trr
+        ,sum(if((a.repayment_status !=3 or (a.repayment_status =3 and a.repaid_at>=c.deadline)) and a.deadline <= c.deadline,c.required_repayment,0)) yqze
         ,sum(if(a.repayment_status !=3 or (a.repayment_status =3 and a.repaid_at>=#{endTime,jdbcType=VARCHAR}),if(b.loan_paid_at>='2018-01-01',g.principal,h.principle),0)) dkye
         ,min(if((a.repayment_status !=3 or (a.repayment_status =3 and a.repaid_at>=c.deadline)) and a.deadline <= c.deadline,c.deadline,null)) min_deadline
         ,max(a.term_no) max_term_no