|
@@ -503,11 +503,14 @@ public class StudentOrderController extends BaseController {
|
|
|
List<Practice4OrganDto> vipBuyNums = courseScheduleEvaluateDao.getVipBuyNums(new Date(), null);
|
|
|
|
|
|
List<Practice4OrganDto> practiceAndVipBuyNums = new ArrayList<>();
|
|
|
- if(vipBuyNums.size() >0 ) {
|
|
|
- studentIds = vipBuyNums.stream().filter(practice4OrganDto -> practice4OrganDto.getOrganId() != null).map(Practice4OrganDto::getStudentIds).collect(Collectors.joining(","));
|
|
|
+
|
|
|
+ studentIds = vipBuyNums.stream().filter(practice4OrganDto -> practice4OrganDto.getOrganId() != null).map(Practice4OrganDto::getStudentIds).collect(Collectors.joining(","));
|
|
|
+ if (!studentIds.isEmpty()) {
|
|
|
practiceAndVipBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(new Date(), null, studentIds);
|
|
|
}
|
|
|
Date startTime = DateUtil.getFirstDayOfMonth(new Date());
|
|
|
+ Date endTime = DateUtil.addMonths(startTime, 1);
|
|
|
+
|
|
|
|
|
|
//当月新增网管课人数
|
|
|
List<PracticeGroupsDto> monthOrganPracticeBuyMoneys = courseScheduleEvaluateDao.getMonthOrganMoney(OrderTypeEnum.PRACTICE_GROUP_BUY, startTime);
|
|
@@ -517,12 +520,13 @@ public class StudentOrderController extends BaseController {
|
|
|
List<PracticeGroupsDto> monthOrganRenewMoneys = courseScheduleEvaluateDao.getMonthOrganMoney(OrderTypeEnum.PRACTICE_GROUP_RENEW, startTime);
|
|
|
|
|
|
//本月总人数
|
|
|
- List<Practice4OrganDto> nowMonthPracticeBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(startTime, null, null);
|
|
|
- List<Practice4OrganDto> nowMonthVipBuyNums = courseScheduleEvaluateDao.getVipBuyNums(startTime, null);
|
|
|
+ List<Practice4OrganDto> nowMonthPracticeBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(startTime, endTime, null);
|
|
|
+ List<Practice4OrganDto> nowMonthVipBuyNums = courseScheduleEvaluateDao.getVipBuyNums(startTime, endTime);
|
|
|
List<Practice4OrganDto> nowMonthPracticeAndVipBuyNums = new ArrayList<>();
|
|
|
- if(nowMonthVipBuyNums.size()>0) {
|
|
|
- studentIds = vipBuyNums.stream().filter(practice4OrganDto -> practice4OrganDto.getOrganId() != null).map(Practice4OrganDto::getStudentIds).collect(Collectors.joining(","));
|
|
|
- nowMonthPracticeAndVipBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(startTime, null, studentIds);
|
|
|
+
|
|
|
+ studentIds = vipBuyNums.stream().filter(practice4OrganDto -> practice4OrganDto.getOrganId() != null).map(Practice4OrganDto::getStudentIds).collect(Collectors.joining(","));
|
|
|
+ if (!studentIds.isEmpty()) {
|
|
|
+ nowMonthPracticeAndVipBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(startTime, endTime, studentIds);
|
|
|
}
|
|
|
|
|
|
//上月总人数
|
|
@@ -530,8 +534,9 @@ public class StudentOrderController extends BaseController {
|
|
|
List<Practice4OrganDto> lastMonthPracticeBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(lastMonthStartTime, startTime, null);
|
|
|
List<Practice4OrganDto> lastMonthVipBuyNums = courseScheduleEvaluateDao.getVipBuyNums(lastMonthStartTime, startTime);
|
|
|
List<Practice4OrganDto> lastMonthPracticeAndVipBuyNums = new ArrayList<>();
|
|
|
- if(lastMonthVipBuyNums.size() >0) {
|
|
|
- studentIds = vipBuyNums.stream().filter(practice4OrganDto -> practice4OrganDto.getOrganId() != null).map(Practice4OrganDto::getStudentIds).collect(Collectors.joining(","));
|
|
|
+
|
|
|
+ studentIds = vipBuyNums.stream().filter(practice4OrganDto -> practice4OrganDto.getOrganId() != null).map(Practice4OrganDto::getStudentIds).collect(Collectors.joining(","));
|
|
|
+ if (!studentIds.isEmpty()) {
|
|
|
lastMonthPracticeAndVipBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(lastMonthStartTime, startTime, studentIds);
|
|
|
}
|
|
|
|
|
@@ -572,25 +577,23 @@ public class StudentOrderController extends BaseController {
|
|
|
for (Practice4OrganDto practiceBuyNum : practiceBuyNums) {
|
|
|
if (organ.getId().equals(practiceBuyNum.getOrganId())) {
|
|
|
practice4OrganDto.setPracticeNum(practiceBuyNum.getPracticeNum());
|
|
|
- practice4OrganDto.setTotalNum(practice4OrganDto.getTotalNum() + practiceBuyNum.getPracticeNum());
|
|
|
+ break;
|
|
|
}
|
|
|
- break;
|
|
|
}
|
|
|
//VIP课转化人数
|
|
|
for (Practice4OrganDto vipBuyNum : vipBuyNums) {
|
|
|
if (organ.getId().equals(vipBuyNum.getOrganId())) {
|
|
|
practice4OrganDto.setVipNum(vipBuyNum.getVipNum());
|
|
|
- practice4OrganDto.setTotalNum(practice4OrganDto.getTotalNum() + vipBuyNum.getVipNum());
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
for (Practice4OrganDto practiceAndVipBuyNum : practiceAndVipBuyNums) {
|
|
|
if (organ.getId().equals(practiceAndVipBuyNum.getOrganId())) {
|
|
|
practice4OrganDto.setVipNum(practice4OrganDto.getVipNum() - practiceAndVipBuyNum.getPracticeNum());
|
|
|
- practice4OrganDto.setTotalNum(practice4OrganDto.getTotalNum() - practiceAndVipBuyNum.getVipNum());
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ practice4OrganDto.setTotalNum(practice4OrganDto.getPracticeNum() + practice4OrganDto.getVipNum());
|
|
|
|
|
|
//当月新增网管课人数
|
|
|
for (PracticeGroupsDto monthOrganPracticeBuyMoney : monthOrganPracticeBuyMoneys) {
|
|
@@ -656,11 +659,15 @@ public class StudentOrderController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (practice4OrganDto.getTryNum() > 0) {
|
|
|
+ double scale = new BigDecimal(practice4OrganDto.getTotalNum()).multiply(new BigDecimal(100)).divide(new BigDecimal(practice4OrganDto.getTryNum()), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
+ practice4OrganDto.setScale(scale);
|
|
|
+ }
|
|
|
|
|
|
practice4Organs.add(practice4OrganDto);
|
|
|
}
|
|
|
|
|
|
- practice4Organs = practice4Organs.stream().sorted(Comparator.comparing(Practice4OrganDto::getTotalNum).reversed()).collect(Collectors.toList());
|
|
|
+ practice4Organs = practice4Organs.stream().sorted(Comparator.comparingDouble(Practice4OrganDto::getScale).reversed()).collect(Collectors.toList());
|
|
|
return succeed(practice4Organs);
|
|
|
}
|
|
|
}
|