From df4d97ef7b89317009f506f5952d6e7cecbb8b8a Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 5 Aug 2024 13:22:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E6=97=A5=E5=8E=86,?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E5=8F=8A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/invest/domain/vo/AccountCalendarVo.java  |  4 ++++
 .../invest/service/impl/StatisticAnalysisImpl.java     | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java
index f5e9f04..4085aa6 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java
@@ -18,8 +18,12 @@ public class AccountCalendarVo
 
     private int type;
 
+    private Long accountId;
+
     private String start;
 
+    private String billDatePeriod;
+
     private String  color;
 
     private String  textColor;
diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
index b89bb33..678fb36 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
@@ -2595,6 +2595,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
             payDate.setStart(payDateStr);
             payDate.setTitle(nameCode+ "还款日");
             payDate.setType(2);
+            payDate.setAccountId(bankCard.getId());
             list.add(payDate);
             //周视图，月份不相同，下个月的也加入数据
             if(!analysisDto.getStartTime().split("-")[1].equals(analysisDto.getEndTime().split("-")[1])&&analysisDto.getType().equals("2")){
@@ -2603,6 +2604,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
                 nextPayDate.setStart(nextPayDateStr);
                 nextPayDate.setTitle(nameCode+ "还款日");
                 nextPayDate.setType(2);
+                nextPayDate.setAccountId(bankCard.getId());
                 list.add(nextPayDate);
             }
         }
@@ -2619,6 +2621,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
                 billDate.setStart(billDateStr);
                 billDate.setTitle(nameCode+ "账单:"+creditCardBill.getBillAmount());
                 billDate.setType(1);
+                billDate.setAccountId(creditCardBill.getCreditCardId());
+                billDate.setBillDatePeriod(creditCardBill.getBillDatePeriod());
                 list.add(billDate);
             }
         }
@@ -2639,10 +2643,10 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
                     historyDetail.setType(3);
                 }
                 else {
-                    historyDetail.setTitle(detail.getBankCardLendName()+ "贷款已还:"+detail.getCurrentAmount());
+                    historyDetail.setTitle(detail.getBankCardLendName()+ "贷款已还:"+detail.getPrincipal());
                     historyDetail.setType(4);
                 }
-
+                historyDetail.setAccountId(detail.getBankCardLendId());
                 list.add(historyDetail);
             }
         }
@@ -2747,7 +2751,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         }
 
         //统一设置事件背景色和字体颜色
-        // 1信用卡账单，2还款日，3贷款待还，4贷款已还，5日常支出，6投资收益，7POS机刷卡，8工资收入
+        // 1信用卡账单，2信用卡还款日，3贷款待还，4贷款已还，5日常支出，6投资收益，7POS机刷卡，8工资收入
         for (AccountCalendarVo calendar:list
         ) {
             int type=calendar.getType();