客户还款明细增加资金占用费、资方逾期利息查询

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListVo.java

@@ -57,4 +57,6 @@ public class RepaymentDetailsListVo implements Vo {
     private String closingDate;
     @ApiModelProperty("划扣状态")
     private String buckle;
+    @ApiModelProperty("款项类别")
+    private String payCostTitleValue;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -341,6 +341,10 @@
     </select>
     <select id="repaymentDetailsList"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentDetailsListVo">
+        SELECT DISTINCT
+        *
+        FROM
+        (
         SELECT
         p.useOrgName,
         p.dept,
@@ -357,14 +361,53 @@
         h.actualDate,
         h.actualMoney,
         h.returnWay,
-        date_format(h.dataTime, '%Y-%m-%d') as dataTime,
-        date_format(h.updateTime, '%Y-%m-%d') as updateTime,
+        date_format( h.dataTime, '%Y-%m-%d' ) AS dataTime,
+        date_format( h.updateTime, '%Y-%m-%d' ) AS updateTime,
         h.updateState,
         h.buckle,
-        date_format(h.closingDate, '%Y-%m-%d') as closingDate,
-        h.skdBillNo as billNo
-        FROM loan_repayment_history as h
-        LEFT JOIN loan_repayment_plan_details as p ON h.planDetailSid = p.sid
+        date_format( h.closingDate, '%Y-%m-%d' ) AS closingDate,
+        h.skdBillNo AS billNo,
+        '月还' AS payCostTitleValue,
+        p.orgSidPath,
+        p.salesUserSid
+        FROM
+        loan_repayment_history AS h
+        LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid UNION ALL
+        SELECT
+        p.useOrgName,
+        p.dept,
+        p.staffName,
+        p.loanContractNo,
+        p.vinNo,
+        p.bankName,
+        p.bankContractNo,
+        p.customer,
+        p.borrowerName,
+        p.period,
+        '' AS dueDate,
+        j.reveivableMoney AS dueMoney,
+        s.subscriptionDate AS actualDate,
+        s.subscriptionMoney AS actualMoney,
+        '' AS returnWay,
+        '' AS dataTime,
+        '' AS updateTime,
+        '' AS updateState,
+        '' AS buckle,
+        '' AS closingDate,
+        c.billNo AS billNo,
+        s.receivablesName AS payCostTitleValue,
+        p.orgSidPath,
+        p.salesUserSid
+        FROM
+        anrui_fin.fin_selected_receivables_detailed AS s
+        LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr AS j ON s.receivablesSid = j.sid
+        LEFT JOIN anrui_fin.fin_collection_confirmation AS c ON s.collSid = c.sid
+        LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid
+        WHERE
+        s.receivablesName = '资金占用费'
+        OR s.receivablesName = '资方逾期利息'
+        AND s.auditState = 3
+        ) AS a
         <where>
             ${ew.sqlSegment}
         </where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -1364,18 +1364,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             String orgLevelKey = defaultIdReltBean.getData();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
+                qw.eq("a.salesUserSid", pagerQuery.getUserSid());
             } else {
                 PagerVo<RepaymentDetailsListVo> p = new PagerVo<>();
                 return p;
@@ -1386,77 +1386,77 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         //=======================
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
-            qw.like("p.vinNo", pagerQuery.getVinNo());
+            qw.like("a.vinNo", pagerQuery.getVinNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
-            qw.like("p.useOrgName", pagerQuery.getUseOrgName());
+            qw.like("a.useOrgName", pagerQuery.getUseOrgName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDept())) {
-            qw.like("p.dept", pagerQuery.getDept());
+            qw.like("a.dept", pagerQuery.getDept());
         }
         if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) {
-            qw.like("h.returnWayKey", pagerQuery.getReturnWayKey());
+            qw.like("a.returnWayKey", pagerQuery.getReturnWayKey());
         }
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
-            qw.like("p.staffName", pagerQuery.getStaffName());
+            qw.like("a.staffName", pagerQuery.getStaffName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
-            qw.like("h.buckleKey", pagerQuery.getBuckleKey());
+            qw.like("a.buckleKey", pagerQuery.getBuckleKey());
         }
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
-            qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
+            qw.like("a.loanContractNo", pagerQuery.getLoanContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getPeriod())) {
-            qw.eq("p.period", pagerQuery.getPeriod());
+            qw.eq("a.period", pagerQuery.getPeriod());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
-            qw.like("p.bankName", pagerQuery.getBankName());
+            qw.like("a.bankName", pagerQuery.getBankName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
-            qw.like("p.bankContractNo", pagerQuery.getBankContractNo());
+            qw.like("a.bankContractNo", pagerQuery.getBankContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getCustomer())) {
-            qw.like("p.customer", pagerQuery.getCustomer());
+            qw.like("a.customer", pagerQuery.getCustomer());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {
-            qw.like("p.borrowerName", pagerQuery.getBorrowerName());
+            qw.like("a.borrowerName", pagerQuery.getBorrowerName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBillNo())) {
-            qw.like("h.skdBillNo", pagerQuery.getBillNo());
+            qw.like("a.skdBillNo", pagerQuery.getBillNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUpdateState())) {
-            qw.eq("h.updateState", pagerQuery.getUpdateState());
+            qw.eq("a.updateState", pagerQuery.getUpdateState());
         }
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
-        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
                 );
         String actualStartDate = pagerQuery.getActualStartDate();
         String actualEndDate = pagerQuery.getActualEndDate();
-        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (a.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (a.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
                 );
         String dataStartTime = pagerQuery.getDataStartTime();
         String dataEndTime = pagerQuery.getDataEndTime();
-        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (h.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (a.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (a.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
                 );
         String closingStartDate = pagerQuery.getClosingStartDate();
         String closingEndDate = pagerQuery.getClosingEndDate();
-        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (h.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (h.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (a.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
                 );
         String updateStartTime = pagerQuery.getUpdateStartDate();
         String updateEndTime = pagerQuery.getUpdateEndDate();
-        qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (h.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(updateEndTime), "date_format (h.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (a.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
                 );
         qw.eq("1", "1");
-        qw.orderBy(true, true, "p.useOrgName")
-                .orderBy(true, true, "p.vinNo")
-                .orderBy(true, true, "p.period")
-                .orderBy(true, true, "p.loanContractNo")
+        qw.orderBy(true, true, "a.useOrgName")
+                .orderBy(true, true, "a.vinNo")
+                .orderBy(true, true, "a.period")
+                .orderBy(true, true, "a.loanContractNo")
         ;
         IPage<RepaymentDetailsListVo> pagging = baseMapper.repaymentDetailsList(page, qw);
         PagerVo<RepaymentDetailsListVo> p = PagerUtil.pageToVo(pagging, null);