|
@@ -3372,16 +3372,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
if(Objects.isNull(userFreePracticeGroup)){
|
|
|
continue;
|
|
|
}
|
|
|
- ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(userFreePracticeGroup.getId().toString(), GroupType.PRACTICE.getCode());
|
|
|
+// ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(userFreePracticeGroup.getId().toString(), GroupType.PRACTICE.getCode());
|
|
|
+//
|
|
|
+// CourseScheduleEvaluate courseScheduleEvaluate = courseScheduleEvaluateDao.findByClassGroupId(classGroup.getId());
|
|
|
+// if(Objects.isNull(courseScheduleEvaluate)){
|
|
|
+// continue;
|
|
|
+// }
|
|
|
|
|
|
- CourseScheduleEvaluate courseScheduleEvaluate = courseScheduleEvaluateDao.findByClassGroupId(classGroup.getId());
|
|
|
- if(Objects.isNull(courseScheduleEvaluate)){
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
- String pushUrl = baseApiUrl + "/#/reportDetail?classGroupId=" + classGroup.getId();
|
|
|
+ String pushUrl = baseApiUrl + "/#/reportDetail?classGroupId=" + report.getClassGroupId();
|
|
|
|
|
|
- String smsUrl = baseApiUrl + "/#/transfer?url=" + baseApiUrl + "&hash=reportDetail&classGroupId=" + classGroup.getId();
|
|
|
+ String smsUrl = baseApiUrl + "/#/transfer?url=" + baseApiUrl + "&hash=reportDetail&classGroupId=" + report.getClassGroupId();
|
|
|
|
|
|
// SysUser student = sysUserFeignService.queryUserById(userFreePracticeGroup.getStudentId());
|
|
|
SysUser student = teacherDao.getUser(userFreePracticeGroup.getStudentId());
|