From 6f0d2db1ba5fa9782a673b5bab341fd0c1834776 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 9 Aug 2024 13:55:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=BA=E6=83=85=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=80=9F=E6=AC=BE=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java  | 4 ++++
 .../service/impl/InstallmentHistoryServiceImpl.java       | 8 ++++++++
 2 files changed, 12 insertions(+)

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 e8f32a8..448a751 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
@@ -35,4 +35,8 @@ public class InstallmentHistoryVo extends InstallmentHistory
     @ApiModelProperty(value="剩余利息)")
     private Double outstandingInterest;
 
+
+    @ApiModelProperty(value="借款天数")
+    private String loanDays;
+
 }
diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java
index 9125632..2467c9b 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -61,6 +62,13 @@ public class InstallmentHistoryServiceImpl implements IInstallmentHistoryService
         //修改名称加卡号
         DecimalFormat decimalFormat = new DecimalFormat("#.##");
         for (InstallmentHistoryVo installmentHistory : installmentHistoryVoList) {
+            String   daysBetween="";
+            if(installmentHistory.getCloseDate()!=null){
+                 daysBetween = DateUtils.timeDistance(installmentHistory.getCloseDate(),installmentHistory.getInstallmentDate());
+            }else {
+                daysBetween = DateUtils.timeDistance(new Date(),installmentHistory.getInstallmentDate());
+            }
+            installmentHistory.setLoanDays(daysBetween);
             if(installmentHistory.getBankCode()!=null){
                 installmentHistory.setBankNameCode(installmentHistory.getBankName()+"（"+ StringUtils.getLastNumberChars(4,installmentHistory.getBankCode()+"）"));
             }else {