数据分割

src/main/java/cn/quantgroup/report/controller/ManualToolController.java

@@ -155,9 +155,9 @@ public class ManualToolController {
   }
 
   @RequestMapping("/createFile")
-  public String testD2Repost(String type, String startDate, String endDate, Integer daySpilt, String loanStartDateStr, String loanEndDateStr, String prefix){
+  public String testD2Repost(String type, String startDate, String endDate, Integer daySpilt, String loanStartDateStr, String loanEndDateStr, String prefix, String linkPointTimeStr){
     try {
-      fileReportService.createReportFile(type,startDate,endDate,daySpilt,loanStartDateStr,loanEndDateStr,prefix);
+      fileReportService.createReportFile(type,startDate,endDate,daySpilt,loanStartDateStr,loanEndDateStr,prefix,linkPointTimeStr);
       return "SUCCESS";
     }catch (Exception e){
       return e.getMessage();

src/main/java/cn/quantgroup/report/domain/baihang/BaiHangTimeRecord.java

@@ -23,4 +23,6 @@ public class BaiHangTimeRecord {
 
     private String loanEndTime;
 
+    private String linkPointTime;
+
 }

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

@@ -990,13 +990,15 @@
         from (select a.*
               from xyqb.repayment_plan a
                        left join xyqb.loan_application_manifest_history b
-                                 on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{loanStartTime,jdbcType=VARCHAR} and b.loan_paid_at < #{loanEndTime,jdbcType=VARCHAR}
+                                 on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{startTime,jdbcType=VARCHAR} and b.loan_paid_at < #{endTime,jdbcType=VARCHAR}
               where (a.repayment_status !=3 or (a.repayment_status =3 and a.repaid_at>=a.deadline))
                 and b.funding_corp_id in (1080,100040,1030,100030)
                 and b.transaction_status in (2,5)
                 and b.contract_term not in (2,3)
-                and a.deadline >= #{startTime,jdbcType=VARCHAR}
-                and a.deadline < #{endTime,jdbcType=VARCHAR}) a
+                <if test="linkPointTime != null">
+                    and a.deadline >= #{linkPointTime,jdbcType=VARCHAR}
+                </if>
+                and a.deadline &lt; NOW()) a
                  left join xyqb_user.user_detail b on a.user_id=b.user_id
                  left join xyqb.loan_account_ext c on a.loan_application_history_id=c.loan_id
                  left join xyqb.apply_quota_record d on c.order_no=d.order_no
@@ -1005,7 +1007,7 @@
                                  ,min(if(((a.repayment_status !=3 and (c.repayment_received_at is null or DATE_FORMAT(c.repayment_received_at,'%Y-%m-%d') = '2000-01-01' or a.deadline &lt;= c.repayment_received_at)) or (a.repayment_status =3 and a.deadline &lt;= c.repayment_received_at)),c.deadline,null)) min_deadline
                             from xyqb.repayment_plan a
                                      left join xyqb.loan_application_manifest_history b
-                                               on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{loanStartTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{loanEndTime,jdbcType=VARCHAR}
+                                               on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{startTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{endTime,jdbcType=VARCHAR}
                                      left join xyqb.repayment_record g on a.id=g.repayment_plan_id
                                      left join xyqb.plan_amount_detail h on a.id=h.plan_id
                                      left join xyqb.repayment_plan c on a.loan_application_history_id=c.loan_application_history_id
@@ -1018,7 +1020,7 @@
                  ,sum(if(g.repayment_status !=3 or (g.repayment_status =3 and if(TO_DAYS(IFNULL(a.repayment_received_at,NOW()))!=TO_DAYS(date(DATE_sub(a.deadline,INTERVAL 1 second))),a.deadline,a.repayment_received_at) &lt;= g.repayment_received_at),if(b.loan_paid_at>='2018-01-01',g.principal,h.principle),0)) dkye
             from xyqb.repayment_plan a
                      left join xyqb.loan_application_manifest_history b
-                               on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{loanStartTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{loanEndTime,jdbcType=VARCHAR}
+                               on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{startTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{endTime,jdbcType=VARCHAR}
                      left join xyqb.repayment_record g on a.loan_application_history_id=g.loan_application_history_id
                      left join xyqb.plan_amount_detail h on a.id=h.plan_id
             where b.funding_corp_id in (1080,100040,1030,100030)
@@ -1029,7 +1031,7 @@
              if(TO_DAYS(IFNULL(a.repayment_received_at,NOW()))!=TO_DAYS(date(DATE_sub(a.deadline,INTERVAL 1 second))),a.deadline,a.repayment_received_at) received_at
             from xyqb.repayment_plan a
         left join xyqb.loan_application_manifest_history b
-        on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{loanStartTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{loanEndTime,jdbcType=VARCHAR}
+        on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{startTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{endTime,jdbcType=VARCHAR}
         where b.funding_corp_id in (1080,100040,1030,100030)
         group by a.loan_application_history_id,a.term_no
             ) z on a.loan_application_history_id=z.loan_application_history_id and a.term_no=z.term_no
@@ -1183,7 +1185,7 @@
         select a.loan_application_history_id,max(a.repayment_received_at) as repaymentReceivedAt,max(a.deadline) as deadline
         from xyqb.repayment_plan a
                  left join xyqb.loan_application_manifest_history b
-                           on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{loanStartTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{loanEndTime,jdbcType=VARCHAR}
+                           on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at >= #{startTime,jdbcType=VARCHAR} and b.loan_paid_at &lt; #{endTime,jdbcType=VARCHAR}
         where (a.repayment_status !=3 or (a.repayment_status =3 and a.repaid_at>=a.deadline))
           and b.funding_corp_id in (1080,100040,1030,100030)
           and b.transaction_status in (2,5)