系统收费首页经营报表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -228,9 +228,14 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 			IndexBaseDto indexBaseData = new IndexBaseDto(typeDateMapEntry.getKey(),typeDateMapEntry.getKey().getMsg());
 			indexBaseData.setIndexMonthData(typeDateMapEntry.getValue(), currentMonth);
-			if(IndexDataType.FINANCE_PAY.equals(typeDateMapEntry.getKey()) || FINANCE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
-				IndexDataType.FINANCE_BALANCE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
-					IndexDataType.TOTAL_AMOUNT.equals(typeDateMapEntry.getKey())){
+			if(FINANCE_PAY.equals(typeDateMapEntry.getKey()) || FINANCE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+				FINANCE_BALANCE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+					TOTAL_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+					APPLY_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+					RENEW_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+					VIP_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+					PRACTICE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
+					OTHER_AMOUNT.equals(typeDateMapEntry.getKey())){
 				indexBaseData.setPercent(typeDateMapEntry.getValue().stream().map(IndexBaseMonthData::getPercent).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
 			if(IndexDataType.VIP_GROUP_COURSE.equals(typeDateMapEntry.getKey()) || VIP_GROUP_ONLINE_COURSE.equals(typeDateMapEntry.getKey()) ||