首页经营数据调整

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

@@ -280,20 +280,21 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 			IndexBaseDto indexBaseData = new IndexBaseDto(typeDateMapEntry.getKey(),typeDateMapEntry.getKey().getMsg());
 			indexBaseData.setIndexMonthData(typeDateMapEntry.getValue(), currentMonth);
-			List<IndexBaseMonthData> indexMonthData = indexBaseData.getIndexMonthData();
-			List<IndexBaseMonthData> otherAmountDetails = new ArrayList<>();
-			if(indexMonthData != null && indexMonthData.size() > 0){
-				Map<String, List<IndexBaseMonthData>> collect = indexMonthData.stream().collect(Collectors.groupingBy(e -> e.getOrderType()));
-				collect.keySet().forEach(e->{
-					IndexBaseMonthData data = new IndexBaseMonthData();
-					data.setOrderType(e);
-					BigDecimal reduce = collect.get(e).stream().map(IndexBaseMonthData::getPercent).reduce(BigDecimal.ZERO, BigDecimal::add);
-					data.setPercent(reduce);data.setActivateNum(reduce);data.setTotalNum(reduce);
-					otherAmountDetails.add(data);
-				});
-			}
-			indexBaseData.setIndexMonthDataDetail(otherAmountDetails);
-			typeDateMap.put(OTHER_AMOUNT_DETAIL,otherAmountDetails);
+			if(OTHER_AMOUNT.equals(typeDateMapEntry.getKey())){
+				List<IndexBaseMonthData> indexMonthData = indexBaseData.getIndexMonthData();
+				List<IndexBaseMonthData> otherAmountDetails = new ArrayList<>();
+				if(indexMonthData != null && indexMonthData.size() > 0){
+					Map<String, List<IndexBaseMonthData>> collect = indexMonthData.stream().collect(Collectors.groupingBy(e -> e.getOrderType()));
+					collect.keySet().forEach(e->{
+						IndexBaseMonthData data = new IndexBaseMonthData();
+						data.setOrderType(e);
+						BigDecimal reduce = collect.get(e).stream().map(IndexBaseMonthData::getPercent).reduce(BigDecimal.ZERO, BigDecimal::add);
+						data.setPercent(reduce);data.setActivateNum(reduce);data.setTotalNum(reduce);
+						otherAmountDetails.add(data);
+					});
+				}
+				indexBaseData.setIndexMonthDataDetail(otherAmountDetails);
+			}
 			if(FINANCE_PAY.equals(typeDateMapEntry.getKey()) || FINANCE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
 				FINANCE_BALANCE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
 					TOTAL_AMOUNT.equals(typeDateMapEntry.getKey()) ||