|
@@ -507,7 +507,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> findVipGroupTeachingRecord(VipGroupTeachingRecordQueryInfo queryInfo) {
|
|
|
- if(Objects.isNull(queryInfo.getVipGroupId())){
|
|
|
+ Long vipGroupId = queryInfo.getVipGroupId();
|
|
|
+ if(Objects.isNull(vipGroupId)){
|
|
|
throw new BizException("请指定vip课程!");
|
|
|
}
|
|
|
PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
|
|
@@ -525,11 +526,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
dataList = new ArrayList<>();
|
|
|
}
|
|
|
pageInfo.setRows(dataList);
|
|
|
- TeachingRecordBaseInfo classTimes = vipGroupDao.getClassTimes(queryInfo.getVipGroupId());
|
|
|
- if(!Objects.isNull(classTimes)){
|
|
|
- classTimes.setIsSalaryNum(vipGroupDao.countIsSalaryNum(queryInfo.getVipGroupId()));
|
|
|
- classTimes.setComplaintsNum(vipGroupDao.countComplaintsNum(queryInfo.getVipGroupId()));
|
|
|
- }
|
|
|
+// TeachingRecordBaseInfo classTimes = vipGroupDao.getClassTimes(queryInfo.getVipGroupId());
|
|
|
+ TeachingRecordBaseInfo classTimes = new TeachingRecordBaseInfo();
|
|
|
+ classTimes.setCourseNoStartNum(courseScheduleDao.findCourseNoStartNum(vipGroupId));
|
|
|
+ classTimes.setCourseEndNum(courseScheduleDao.findCourseEndNum(vipGroupId));
|
|
|
+ classTimes.setIsSalaryNum(vipGroupDao.countIsSalaryNum(vipGroupId));
|
|
|
+ classTimes.setComplaintsNum(vipGroupDao.countComplaintsNum(vipGroupId));
|
|
|
Map<String,Object> result=new HashMap<>();
|
|
|
result.put("pageInfo",pageInfo);
|
|
|
result.put("baseInfo",classTimes);
|