qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 首页日历,自测问题修复及功能完善。

Browse Source
This commit is contained in:
tianyongbao
2024-08-05 13:22:12 +08:00
parent 5814d46a23
commit df4d97ef7b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java
View File

@@ -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;

10
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
View File

@@ -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();