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

fix：数据格式统一修复。

Browse Source 
(cherry picked from commit eae2dc899b)
This commit is contained in:
tianyongbao
2024-04-26 18:09:53 +08:00
parent f07d3e858f
commit ec224dc992
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,7 +440,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", creditCardBillVo.getName()); datamap.put("time", creditCardBillVo.getName());
datamap.put("value", creditCardBillVo.getBillAmount()); datamap.put("value", decimalFormat.format(creditCardBillVo.getBillAmount()));
tableCreditBillList.add(datamap); tableCreditBillList.add(datamap);
} }
Collections.reverse(creditAnalysisList); Collections.reverse(creditAnalysisList);
@@ -448,7 +448,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", creditCardBillVo.getName()); datamap.put("time", creditCardBillVo.getName());
datamap.put("value", creditCardBillVo.getBillAmount()); datamap.put("value", decimalFormat.format(creditCardBillVo.getBillAmount()));
creditBillList.add(datamap); creditBillList.add(datamap);
} }
//列表 //列表
@@ -599,7 +599,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", futureStocksBillVo.getName()); datamap.put("time", futureStocksBillVo.getName());
datamap.put("value", futureStocksBillVo.getBillAmount()); datamap.put("value", decimalFormat.format(futureStocksBillVo.getBillAmount()));
tableFuturesStocksList.add(datamap); tableFuturesStocksList.add(datamap);
} }
Collections.reverse(futureStocksBillList); Collections.reverse(futureStocksBillList);
@@ -607,7 +607,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", futureStocksBillVo.getName()); datamap.put("time", futureStocksBillVo.getName());
datamap.put("value", futureStocksBillVo.getBillAmount()); datamap.put("value", decimalFormat.format(futureStocksBillVo.getBillAmount()));
futuresStocksList.add(datamap); futuresStocksList.add(datamap);
} }
//列表 //列表
@@ -803,7 +803,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", vo.getRemark()); datamap.put("time", vo.getRemark());
datamap.put("value", vo.getCurrentAmount()); datamap.put("value", decimalFormat.format(vo.getCurrentAmount()));
tableHistoryDetailList.add(datamap); tableHistoryDetailList.add(datamap);
} }
Collections.reverse(installmentHistoryDetailList); Collections.reverse(installmentHistoryDetailList);
@@ -811,7 +811,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", vo.getRemark()); datamap.put("time", vo.getRemark());
datamap.put("value", vo.getCurrentAmount()); datamap.put("value", decimalFormat.format(vo.getCurrentAmount()));
historyDetailList.add(datamap); historyDetailList.add(datamap);
} }
//列表 //列表
@@ -1181,7 +1181,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", vo.getRemark()); datamap.put("time", vo.getRemark());
datamap.put("value", vo.getInstallmentAmount()); datamap.put("value", decimalFormat.format(vo.getInstallmentAmount()));
tableHistoryList.add(datamap); tableHistoryList.add(datamap);
} }
Collections.reverse(installmentHistoryVoList); Collections.reverse(installmentHistoryVoList);
@@ -1189,7 +1189,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", vo.getRemark()); datamap.put("time", vo.getRemark());
datamap.put("value", vo.getInstallmentAmount()); datamap.put("value", decimalFormat.format(vo.getInstallmentAmount()));
historyList.add(datamap); historyList.add(datamap);
} }
//列表 //列表
@@ -1439,7 +1439,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", vo.getRemark()); datamap.put("time", vo.getRemark());
datamap.put("value", vo.getAmount()); datamap.put("value", decimalFormat.format(vo.getAmount()));
tablePosList.add(datamap); tablePosList.add(datamap);
} }
Collections.reverse(queryList); Collections.reverse(queryList);
@@ -1447,7 +1447,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
) { ) {
Map<String, Object> datamap = new HashMap<>(); Map<String, Object> datamap = new HashMap<>();
datamap.put("time", vo.getRemark()); datamap.put("time", vo.getRemark());
datamap.put("value", vo.getAmount()); datamap.put("value", decimalFormat.format(vo.getAmount()));
posList.add(datamap); posList.add(datamap);
} }
//列表 //列表