|
|
@@ -131,15 +131,15 @@ public class TradingDataServiceImpl implements TradingDataService {
|
|
|
RecentOfYear ofYear6 = new RecentOfYear("实收金额");
|
|
|
ofYear6.setTwoYear(ofYear2.getTwoYear() - ofYear4.getTwoYear());
|
|
|
ofYear6.setOneYear(ofYear2.getOneYear() - ofYear4.getOneYear());
|
|
|
- ofYear6.setThisYear(ofYear2.getThisYear() - ofYear2.getThisYear());
|
|
|
+ ofYear6.setThisYear(ofYear2.getThisYear() - ofYear4.getThisYear());
|
|
|
ofYear6.setOneYearNum(NumFormat.getIncrease(ofYear6.getTwoYear(), ofYear6.getOneYear()));
|
|
|
ofYear6.setThisYearNum(NumFormat.getIncrease(ofYear6.getOneYear(), ofYear6.getThisYear()));
|
|
|
years.add(ofYear6);
|
|
|
// 实收笔数
|
|
|
RecentOfYear ofYear7 = new RecentOfYear("实收笔数");
|
|
|
- ofYear7.setTwoYear(ofYear3.getTwoYear() - ofYear3.getTwoYear());
|
|
|
- ofYear7.setOneYear(ofYear3.getOneYear() - ofYear3.getOneYear());
|
|
|
- ofYear7.setThisYear(ofYear3.getThisYear() - ofYear3.getThisYear());
|
|
|
+ ofYear7.setTwoYear(ofYear3.getTwoYear() - ofYear5.getTwoYear());
|
|
|
+ ofYear7.setOneYear(ofYear3.getOneYear() - ofYear5.getOneYear());
|
|
|
+ ofYear7.setThisYear(ofYear3.getThisYear() - ofYear5.getThisYear());
|
|
|
ofYear7.setOneYearNum(NumFormat.getIncrease(ofYear7.getTwoYear(), ofYear7.getOneYear()));
|
|
|
ofYear7.setThisYearNum(NumFormat.getIncrease(ofYear7.getOneYear(), ofYear7.getThisYear()));
|
|
|
years.add(ofYear7);
|