云教练作业优化

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherSignOutDto.java

@@ -11,7 +11,7 @@ import com.ym.mec.biz.dal.entity.TeacherAttendance;
  */
 public class TeacherSignOutDto {
 
-    @ApiModelProperty(value = "教师签退信息",required = true)
+    @ApiModelProperty(value = "教师签退信息")
     private TeacherAttendance teacherAttendanceInfo;
 
     @ApiModelProperty(value = "课后作业信息")

mec-biz/src/main/java/com/ym/mec/biz/service/CourseReviewService.java

@@ -100,12 +100,10 @@ public interface CourseReviewService extends BaseService<Integer, CourseSchedule
 
 	/**
 	 * 布置线上课作业
-	 * @param courseScheduleId
-	 * @param content
-	 * @param expiryDate
+	 * @param courseHomeworkInfo
 	 * @return
 	 */
-	CourseHomework addHomeWork(Integer courseScheduleId,String content, Date expiryDate,String musicScoreId);
+	CourseHomework addHomeWork(CourseHomework courseHomeworkInfo);
 
 	/**
 	 * 获取网管课列表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -532,21 +532,20 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public CourseHomework addHomeWork(Integer courseScheduleId, String content, Date expiryDate,String musicScoreId) {
+    public CourseHomework addHomeWork(CourseHomework courseHomeworkInfo) {
+        String content = courseHomeworkInfo.getContent();
+        Date expiryDate = courseHomeworkInfo.getExpiryDate();
         if (StringUtils.isBlank(content)) {
             throw new BizException("作业内容不能为空");
         }
-        if (courseScheduleId == null || courseScheduleId <= 0) {
-            throw new BizException("课程id必须大于0");
-        }
         Date date = new Date();
-        CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
+        CourseSchedule courseSchedule = courseScheduleDao.get(courseHomeworkInfo.getCourseScheduleId());
         if (courseSchedule == null) {
             throw new BizException("课程不存在");
         }
         studentDao.lockUser(courseSchedule.getActualTeacherId());
 
-        CourseHomework existHomework = courseHomeworkDao.findByCourseSchedule(courseScheduleId.longValue());
+        CourseHomework existHomework = courseHomeworkDao.findByCourseSchedule(courseHomeworkInfo.getCourseScheduleId());
 
         //新增课堂作业
         CourseHomework courseHomework = new CourseHomework();
@@ -578,6 +577,27 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             courseHomeworkService.insert(courseHomework);
         }
 
+        /*List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
+
+        //获取按学员声部发放的作业
+        List<MusicScoreSubjectDto> musicScoreSubjectDto = courseHomework.getMusicScoreSubjectDto();
+        if(musicScoreSubjectDto != null && musicScoreSubjectDto.size() > 0){
+            for (MusicScoreSubjectDto scoreSubjectDto : musicScoreSubjectDto) {
+                studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(courseHomework.getCourseScheduleId(),
+                        courseHomework.getId(),
+                        StringUtils.join(scoreSubjectDto.getMusicScoreIdList(),","),
+                        scoreSubjectDto.getUserIdList()));
+            }
+        }else {
+            studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(courseHomework.getCourseScheduleId(),
+                    courseHomework.getId(),
+                    courseHomework.getMusicScoreId(),
+                    null));
+        }
+        if(CollectionUtils.isEmpty(studentCourseHomeworks)){
+            throw new BizException("此课程没有学生");
+        }*/
+
         if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
             Teacher teacher = teacherDao.get(courseSchedule.getActualTeacherId());
             String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 3), "MM月dd日");
@@ -586,7 +606,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                 if (Objects.isNull(existHomework)) {
                     studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
                     studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
-                    studentCourseHomework.setMusicScoreId(musicScoreId);
+//                    studentCourseHomework.setMusicScoreId(musicScoreId);
                     studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
                     studentCourseHomework.setCreateTime(date);
                     studentCourseHomework.setUpdateTime(date);

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseReviewController.java

@@ -2,6 +2,7 @@ package com.ym.mec.teacher.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.biz.dal.page.CourseReviewQueryInfo;
 import com.ym.mec.biz.service.CourseReviewService;
@@ -107,16 +108,12 @@ public class CourseReviewController extends BaseController {
 
     @ApiOperation(value = "布置线上课作业")
     @PostMapping(value = "/addHomeWork")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "courseId", value = "课程编号", required = true, dataType = "int"),
-            @ApiImplicitParam(name = "content", value = "作业内容", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "musicScoreId", value = "伴奏编号", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "expiryDate", value = "作业截止日期", required = true, dataType = "Date")})
-    public HttpResponseResult addHomeWork(Integer courseId, String content, Date expiryDate,String musicScoreId) {
+    public HttpResponseResult addHomeWork(@RequestBody CourseHomework courseHomeworkInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(sysUser)) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(courseReviewService.addHomeWork(courseId,content,expiryDate,musicScoreId));
+        return succeed(courseReviewService.addHomeWork(courseHomeworkInfo));
     }
 
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -25,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -87,6 +84,19 @@ public class ExtracurricularExercisesController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "创建课外训练")
+    @PostMapping("/createExtraExercisesForJson")
+    @AuditLogAnnotation(operateName = "创建课外训练")
+    private HttpResponseResult createExtraExercisesForJson(@RequestBody ExtracurricularExercises exercises){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(sysUser)){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+        exercises.setTeacherId(sysUser.getId());
+        extracurricularExercisesService.createExtraExercises(exercises);
+        return succeed();
+    }
+
     @ApiOperation(value = "获取课外训练列表")
     @GetMapping("/findExtraExercilses")
     private HttpResponseResult findExtraExercilses(ExtraExercilseQueryInfo queryInfo){