Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

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

@@ -114,7 +114,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		typeDateMap.put(FINANCE_AMOUNT,indexBaseMonthDataDao.getFinanceActualDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds)));
 		List<IndexBaseMonthData> totalAmountDataWithTimely = indexBaseMonthDataDao.getTotalAmountDataWithTimely(startDate.toString(), endDate.toString(), new ArrayList<>(organIds));
 
-		if(financePayDataWithTimely.size() > 0){
+		/*if(financePayDataWithTimely.size() > 0){
 			for (IndexBaseMonthData indexBaseMonthData : financePayDataWithTimely) {
 				BigDecimal percent = indexBaseMonthData.getPercent();
 				if(percent != null && percent.doubleValue() != 0d){
@@ -142,7 +142,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				}
 			}
 			totalAmountDataWithTimely = totalAmountDataWithTimely.stream().sorted(Comparator.comparing(IndexBaseMonthData::getMonth)).collect(Collectors.toList());
-		}
+		}*/
 
 		typeDateMap.put(IndexDataType.TOTAL_AMOUNT,totalAmountDataWithTimely);