From f07d3e858ff84c795a6f9c23a4978c3d734e9eac Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 26 Apr 2024 17:33:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=80=E8=BF=91=E8=BF=98?=
 =?UTF-8?q?=E6=AC=BE=E6=97=A5=E6=9C=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/invest/domain/vo/InstallmentHistoryVo.java  |  6 ++++++
 .../mapper/invest/InstallmentHistoryMapper.xml        | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java
index 52c92b5..7871646 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java
@@ -4,6 +4,9 @@ import com.ruoyi.invest.domain.InstallmentHistory;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
 /**
  * 网贷及分期历史Vo对象 installment_history
  *
@@ -22,4 +25,7 @@ public class InstallmentHistoryVo extends InstallmentHistory
 
     @ApiModelProperty(value="银行卡名称卡号)")
     private String bankNameCode;
+
+    @ApiModelProperty(value="最近还款日)")
+    private Date repaymentDate;
 }
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
index c1b4386..b65c6d5 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="balance"    column="balance"    />
         <result property="bankName"    column="bank_name"    />
         <result property="bankCode"    column="bank_code"    />
-
+        <result property="repaymentDate"    column="repayment_date"    />
     </resultMap>
 
     <sql id="selectInstallmentHistoryVo">
@@ -53,6 +53,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ihd.installment_history_id = a.id
         and ihd .posting_state = '0'
         ) as balance,
+        (
+        select
+        min(d.repayment_date)
+        from
+        installment_history_detail d
+        where
+        d.installment_history_id = a.id
+        and d.posting_state = '0')
+        as repayment_date,
         a.repaid_period,
         a.total_interest,
         a.interest_rate,