|
@@ -1,22 +1,21 @@
|
|
|
package com.ym.mec.web.controller.school;
|
|
|
|
|
|
|
|
|
-import com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto;
|
|
|
-import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto;
|
|
|
-import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
|
|
|
+import com.ym.mec.biz.dal.dto.*;
|
|
|
import com.ym.mec.biz.dal.entity.StudentCourseHomework;
|
|
|
import com.ym.mec.biz.dal.enums.ELessonTrainingType;
|
|
|
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryDto;
|
|
|
import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
|
|
|
-import com.ym.mec.biz.service.StudentCourseHomeworkService;
|
|
|
-import com.ym.mec.biz.service.StudentLessonExaminationDetailService;
|
|
|
-import com.ym.mec.biz.service.StudentLessonExaminationService;
|
|
|
+import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.page.PageInfo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -34,9 +33,52 @@ public class SchoolStudentHomeworkController extends BaseController {
|
|
|
private StudentLessonExaminationService studentLessonExaminationService;
|
|
|
@Resource
|
|
|
private StudentLessonExaminationDetailService studentLessonExaminationDetailService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private StudentCourseHomeworkService studentCourseHomeworkService;
|
|
|
+ @Resource
|
|
|
+ private StudentExtracurricularExercisesSituationService studentExtracurricularExercisesSituationService;
|
|
|
+ @Resource
|
|
|
+ private LessonExaminationService lessonExaminationService;
|
|
|
+ @Resource
|
|
|
+ private MusicGroupDao musicGroupDao;
|
|
|
+ @ApiOperation(value = "获取教师有服务指标的课程列表")
|
|
|
+ @PostMapping("/queryHomework")
|
|
|
+ public HttpResponseResult<PageInfo<CourseHomeworkWrapper.CourseHomeworkList>>
|
|
|
+ queryHomework(@RequestBody CourseHomeworkWrapper.CourseHomeworkQuery queryInfo,@RequestHeader Integer coopId) {
|
|
|
+ //获取合作单位关联的所有乐团列表
|
|
|
+ List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
|
|
|
+ if (CollectionUtils.isEmpty(musicGroupIds)) {
|
|
|
+ return succeed(new PageInfo<>());
|
|
|
+ }
|
|
|
+ queryInfo.setMusicGroupIds(musicGroupIds);
|
|
|
+ return succeed(studentExtracurricularExercisesSituationService.queryTeacherServeHomeworkDetailV2(queryInfo));
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "获取课外作业列表")
|
|
|
+ @PostMapping("/queryExtraHomework")
|
|
|
+ public HttpResponseResult<PageInfo<CourseHomeworkWrapper.CourseHomeworkList>>
|
|
|
+ queryExtraHomework(@RequestBody CourseHomeworkWrapper.CourseHomeworkQuery queryInfo,@RequestHeader Integer coopId) {
|
|
|
+ //获取合作单位关联的所有乐团列表
|
|
|
+ List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
|
|
|
+ if (CollectionUtils.isEmpty(musicGroupIds)) {
|
|
|
+ return succeed(new PageInfo<>());
|
|
|
+ }
|
|
|
+ queryInfo.setMusicGroupIds(musicGroupIds);
|
|
|
+ return succeed(studentExtracurricularExercisesSituationService.queryTeacherExtraHomeworkDetailV2(queryInfo));
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "获取进度评测列表")
|
|
|
+ @PostMapping("queryLessonExamination")
|
|
|
+ public HttpResponseResult<PageInfo<LessonExaminationResultDto>>
|
|
|
+ queryLessonExamination(@RequestBody LessonExaminationQueryInfo queryInfo, @RequestHeader Integer coopId) {
|
|
|
+ //获取合作单位关联的所有乐团列表
|
|
|
+ List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
|
|
|
+ if (CollectionUtils.isEmpty(musicGroupIds)) {
|
|
|
+ return succeed(new PageInfo<>());
|
|
|
+ }
|
|
|
+ queryInfo.setMusicGroupIds(musicGroupIds);
|
|
|
+ return succeed(lessonExaminationService.queryPage(queryInfo));
|
|
|
+ }
|
|
|
|
|
|
@ApiOperation(value = "获取课后评测学员列表")
|
|
|
@PostMapping("queryLessonStudent")
|