Przeglądaj źródła

feat:首页图表

Joburgess 4 lat temu
rodzic
commit
6cc5a43413

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

@@ -192,6 +192,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		preStudentNumData.setTitle(IndexDataType.STUDENT_CONVERSION_PRE_STUDENT_NUM.getMsg());
 		preStudentNumData.setTotalNum(preStudentNum.stream().map(IndexBaseMonthData::getTotalNum).reduce(BigDecimal.ZERO, BigDecimal::add));
 		preStudentNumData.setActivateNum(preStudentNum.stream().map(IndexBaseMonthData::getActivateNum).reduce(BigDecimal.ZERO, BigDecimal::add));
+		preStudentNumData.setPercent(preStudentNumData.getActivateNum());
 
 		List<IndexBaseMonthData> studentNum = typeDataMap.get(IndexDataType.STUDENT_CONVERSION_STUDENT_NUM).getIndexMonthData();
 
@@ -220,7 +221,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		convertStudentNumData.setTotalNum(convertStudentNum.stream().map(IndexBaseMonthData::getTotalNum).reduce(BigDecimal.ZERO, BigDecimal::add));
 		convertStudentNumData.setActivateNum(convertStudentNum.stream().map(IndexBaseMonthData::getActivateNum).reduce(BigDecimal.ZERO, BigDecimal::add));
 
-		if(preStudentNumData.getActivateNum().compareTo(BigDecimal.ZERO)==0){
+		if(true){
+			studentNumData.setPercent(studentNumData.getActivateNum());
+			paymentStudentNumData.setPercent(paymentStudentNumData.getActivateNum());
+			convertStudentNumData.setPercent(convertStudentNumData.getActivateNum());
+		}else if(preStudentNumData.getActivateNum().compareTo(BigDecimal.ZERO)==0){
 			studentNumData.setPercent(BigDecimal.ZERO);
 			paymentStudentNumData.setPercent(BigDecimal.ZERO);
 			convertStudentNumData.setPercent(BigDecimal.ZERO);