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-05-16 18:01:36 +08:00
parent 1b34c44984
commit ab4189a401
2 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java
View File

@@ -1,8 +1,9 @@
package com.ruoyi.invest.domain.vo; package com.ruoyi.invest.domain.vo;
import com.ruoyi.invest.domain.AccountsDealRecord; import com.ruoyi.invest.domain.AccountsDealRecord;
import lombok.Data;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data;
/** /**
* 账户交易记录Vo对象 accounts_deal_record * 账户交易记录Vo对象 accounts_deal_record
* *
@@ -16,4 +17,7 @@ public class AccountsDealRecordVo extends AccountsDealRecord
/** 账户 */ /** 账户 */
private String accountName; private String accountName;
private String dealCategoryName;
} }

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

@@ -1660,6 +1660,9 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
if(vo.getDealType().equals("1")){ if(vo.getDealType().equals("1")){
if(analysisDto.getDataType().equals("5")){
if(vo.getDealCategory().equals("2")){
income+=vo.getAmount(); income+=vo.getAmount();
incomeCount++; incomeCount++;
if(vo.getDealCategory().equals("5")){ if(vo.getDealCategory().equals("5")){
@@ -1667,8 +1670,21 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
posIncomeCount++; posIncomeCount++;
} }
} }
} else {
income+=vo.getAmount();
incomeCount++;
if(vo.getDealCategory().equals("5")){
posIncome+=vo.getAmount();
posIncomeCount++;
}
}
}
//支出 //支出
if(vo.getDealType().equals("2")){ if(vo.getDealType().equals("2")){
if(analysisDto.getDataType().equals("5")){
if(vo.getDealCategory().equals("2")){
expenses+=vo.getAmount(); expenses+=vo.getAmount();
expensesCount++; expensesCount++;
if(vo.getDealCategory().equals("5")){ if(vo.getDealCategory().equals("5")){
@@ -1680,6 +1696,19 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
realExpensesCount++; realExpensesCount++;
} }
} }
} else {
expenses+=vo.getAmount();
expensesCount++;
if(vo.getDealCategory().equals("5")){
posExpenses+=vo.getAmount();
posExpensesCount++;
}
if(vo.getDealCategory().equals("1")){
realExpenses+=vo.getAmount();
realExpensesCount++;
}
}
}
} }
//交易金额 //交易金额
map.put("amount",decimalFormat.format(income-expenses)); map.put("amount",decimalFormat.format(income-expenses));
@@ -1717,7 +1746,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
for (AccountsDealRecordVo vo:accountsDealRecordVoList for (AccountsDealRecordVo vo:accountsDealRecordVoList
) { ) {
if (null != vo.getDealCategory()) { if (null != vo.getDealCategory()) {
vo.setDealCategory(DictUtils.getDictLabel("deal_category", vo.getDealCategory().toString())); vo.setDealCategoryName(DictUtils.getDictLabel("deal_category", vo.getDealCategory().toString()));
} }
String dayString=dateFormat.format(vo.getCreateTime()); String dayString=dateFormat.format(vo.getCreateTime());
@@ -1736,12 +1765,28 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
if(staticsTime.equals(dayString)){ if(staticsTime.equals(dayString)){
if(vo.getDealType().equals("1")){ if(vo.getDealType().equals("1")){
if(analysisDto.getDataType().equals("5")){
if(vo.getDealCategory().equals("2")){
actualCreditBillDay+=vo.getAmount(); actualCreditBillDay+=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategory()+"】收入"+vo.getAmount()+"；<br/>"; details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易盈利"+vo.getAmount()+"；<br/>";
}
} else {
actualCreditBillDay+=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】收入"+vo.getAmount()+"；<br/>";
}
} }
if(vo.getDealType().equals("2")){ if(vo.getDealType().equals("2")){
if(analysisDto.getDataType().equals("5")){
if(vo.getDealCategory().equals("2")){
actualCreditBillDay+=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"交易亏损"+vo.getAmount()+"；<br/>";
}
} else {
actualCreditBillDay-=vo.getAmount(); actualCreditBillDay-=vo.getAmount();
details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategory()+"】支出"+vo.getAmount()+"；<br/>"; details+=vo.getAccountName()+"于"+dateFormatSecond.format(vo.getCreateTime())+"因交易类别【"+vo.getDealCategoryName()+"】支出"+vo.getAmount()+"；<br/>";
}
} }
} }