Merge branch 'zx_2022-11-22' of http://git.dayaedu.com/yonge/mec into master_saas

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -406,10 +406,11 @@ public class StudentManageController extends BaseController {
         cloudStudyStudentDataDto.setEffectiveVipStudentNum(list.stream().collect(Collectors.summingInt(IndexCloudStudySumDto :: getEffectiveVipStudentNum)));
         cloudStudyStudentDataDto.setWaitActivateVipStudentNum(list.stream().collect(Collectors.summingInt(IndexCloudStudySumDto :: getWaitActivateVipStudentNum)));
         cloudStudyStudentDataDto.setVipStudentNum(list.stream().collect(Collectors.summingInt(IndexCloudStudySumDto :: getVipStudentNum)));
+        cloudStudyStudentDataDto.setAgainBuyNum(list.stream().collect(Collectors.summingInt(IndexCloudStudySumDto :: getAgainBuyNum)));
         if(cloudStudyStudentDataDto.getVipStudentNum() != 0){
             double studentNum = (double)cloudStudyStudentDataDto.getVipStudentNum();
-            cloudStudyStudentDataDto.setBuyRate(studentNum / cloudStudyStudentDataDto.getTotalStudentNum());
-            cloudStudyStudentDataDto.setAgainBuyRate(cloudStudyStudentDataDto.getAgainBuyNum() / studentNum);
+            cloudStudyStudentDataDto.setBuyRate(studentNum / cloudStudyStudentDataDto.getTotalStudentNum() * 100);
+            cloudStudyStudentDataDto.setAgainBuyRate(cloudStudyStudentDataDto.getAgainBuyNum() / studentNum * 100);
         }
         result.put("overView",cloudStudyStudentDataDto);
         return succeed(result);