update:作业改为1-n

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseHomeworkController.java

@@ -19,6 +19,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 @RequestMapping("/homework")
@@ -37,17 +39,22 @@ public class CourseHomeworkController extends BaseController {
 	public HttpResponseResult<PageInfo<CourseHomeworkVo>> list(@Valid @RequestBody HomeworkAdminSearch query) {
 		query.setDecorate(YesOrNoEnum.YES);
 		query.setCourseStatus(CourseScheduleEnum.COMPLETE);
-		query.setCourseType(CourseScheduleEnum.PRACTICE);
+
+		List<CourseScheduleEnum> list = new ArrayList<>();
+		list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
+		list.add(CourseScheduleEnum.PRACTICE);
+		query.setCourseType(list);
 		return succeed(PageUtil.pageInfo(courseHomeworkService.selectAdminPage(PageUtil.getPage(query),query)));
 	}
 
 
-	@ApiOperation(value = "首页-我的课程-课程详情(陪练课)-课后作业信息详情",notes = "传入课程编号ID")
-	@GetMapping(value = "/detail/{courseId}")
+	@ApiOperation(value = "课后作业-详情",notes = "传入课程编号ID")
+	@GetMapping(value = "/detail/{courseId}/{studentId}")
 	@PreAuthorize("@pcs.hasPermissions('homework/detail')")
 	public HttpResponseResult<CourseHomeworkDetailVo> detail(@ApiParam(value = "课程编号ID", required = true)
-															 @PathVariable("courseId") Long courseId) {
-		return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId));
+															 @PathVariable("courseId") Long courseId,
+															 @PathVariable("studentId") Long studentId) {
+		return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId,studentId));
 	}
 
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseHomeworkDao.java

@@ -7,6 +7,8 @@ import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentHomeworkVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,19 +36,21 @@ public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	/**
 	 * 课程详情 课后作业信息
 	 *
-	 * @param courseId 课程id
+	 * @param courseId  课程id
+	 * @param studentId
 	 * @return 课后作业信息
 	 */
-	CourseHomeworkDetailVo selectCourseHomeworkDetailByCourseId(@Param("courseId") Long courseId);
+	CourseHomeworkDetailVo selectCourseHomeworkDetailByCourseId(@Param("courseId") Long courseId, @Param("studentId") Long studentId);
 
 	/**
 	 * 获取课程购买的用户信息
 	 *
 	 * @param courseGroupId    课程组id
 	 * @param courseScheduleId 课程id
+	 * @param studentId
 	 * @return 购买用户信息
 	 */
-	CourseHomeworkDetailVo selectPaymentStudentInfo(@Param("courseScheduleId") Long courseScheduleId);
+	CourseHomeworkDetailVo selectPaymentStudentInfo(@Param("courseScheduleId") Long courseScheduleId, @Param("studentId") Long studentId);
 
 	/**
 	 * 获取课程购买的用户信息
@@ -65,12 +69,12 @@ public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	CourseHomeworkDetailVo selectSubjectAndTeacherInfo(@Param("courseGroupId") Long courseGroupId);
 
 	/**
-	 * 查询课程组声部信息
+	 * 查询课程组声部信息 和课程组信息
 	 *
 	 * @param records 课程组id集合
 	 * @return
 	 */
-	List<CourseHomeworkVo> selectSubjectInfoList(@Param("records") List<CourseHomeworkVo> records);
+	List<CourseHomeworkVo> selectSubjectAndGroupInfoList(@Param("records") List<CourseHomeworkVo> records);
 
 	/**
 	 * 查询课程老师信息和学生旷课信息
@@ -87,14 +91,22 @@ public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	 * @param query
 	 * @return
 	 */
-	List<CourseHomeworkVo> selectAdminPage(@Param("page") IPage<CourseHomeworkVo> page,
-										   @Param("param") HomeworkAdminSearch query);
+	List<CourseHomeworkVo> selectAdminPage(@Param("page") IPage<CourseHomeworkVo> page, @Param("param") HomeworkAdminSearch query);
+
+	/**
+	 * 琴房查询课后作业
+	 *
+	 * @param courseId 课程id
+	 * @return
+	 */
+	CourseScheduleHomeworkVo selectCourseHomeworkByCourseId(@Param("courseId") Long courseId);
 
 	/**
-	 * 查询课程提交时间
+	 * 查询课程学生作业
 	 *
-	 * @param courseIdList 课程id集合
+	 * @param courseId 课程id
 	 * @return
 	 */
-	List<CourseHomeworkVo> selectSubmitTime(@Param("courseIdList") List<Long> courseIdList);
+	IPage<StudentHomeworkVo> selectStudentHomeworkByCourseId(@Param("page") IPage<StudentHomeworkVo> page,
+															 @Param("courseId") Long courseId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/CourseHomeworkReviewDto.java

@@ -19,6 +19,10 @@ public class CourseHomeworkReviewDto {
     @NotNull(message = "课程ID不能为空 ")
     private Long courseScheduleId;
 
+    @ApiModelProperty(value = "学生id",required = true)
+    @NotNull(message = "学生id不能为空 ")
+    private Long studentId;
+
     @ApiModelProperty(value = "点评信息",required = true)
     @NotBlank(message = "点评信息不能为空")
     private String review;
@@ -49,4 +53,12 @@ public class CourseHomeworkReviewDto {
     public void setReview(String review) {
         this.review = review;
     }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/CourseScheduleHomeworkSearch.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-31
+ */
+@ApiModel("课程作业相关信息查询")
+public class CourseScheduleHomeworkSearch  extends QueryInfo {
+
+
+    @ApiModelProperty(value = "课程id",required = true)
+    @NotNull(message = "课程id不能为空")
+    private Long courseId;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/HomeworkAdminSearch.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * Description 平台课后作业查询条件
@@ -34,7 +35,7 @@ public class HomeworkAdminSearch extends QueryInfo {
     private Date endTime;
 
     @ApiModelProperty(value = "课程类型： PRACTICE 陪练课； LIVE 直播课",hidden = true)
-    private CourseScheduleEnum courseType;
+    private List<CourseScheduleEnum> courseType;
 
     @ApiModelProperty(value = "课程状态： NOT_START:未开始； ING:进行中； COMPLETE:已完成； CANCEL:已取消",hidden = true)
     private CourseScheduleEnum courseStatus;
@@ -74,11 +75,11 @@ public class HomeworkAdminSearch extends QueryInfo {
         this.endTime = endTime;
     }
 
-    public CourseScheduleEnum getCourseType() {
+    public List<CourseScheduleEnum> getCourseType() {
         return courseType;
     }
 
-    public void setCourseType(CourseScheduleEnum courseType) {
+    public void setCourseType(List<CourseScheduleEnum> courseType) {
         this.courseType = courseType;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/HomeworkSearch.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * Description 课后作业查询条件
@@ -22,8 +23,8 @@ public class HomeworkSearch extends QueryInfo {
     @ApiModelProperty(value = "老师id",hidden = true)
     private Long teacherId;
 
-    @ApiModelProperty(value = "课程类型： PRACTICE 陪练课； LIVE 直播课",hidden = true)
-    private CourseScheduleEnum courseType;
+    @ApiModelProperty(value = "课程类型： PRACTICE 陪练课； LIVE 直播课 PIANO_ROOM_CLASS 琴房",hidden = true)
+    private List<CourseScheduleEnum> courseType;
 
     @ApiModelProperty(value = "课程状态： NOT_START:未开始； ING:进行中； COMPLETE:已完成； CANCEL:已取消",hidden = true)
     private CourseScheduleEnum courseStatus;
@@ -72,11 +73,11 @@ public class HomeworkSearch extends QueryInfo {
         this.teacherId = teacherId;
     }
 
-    public CourseScheduleEnum getCourseType() {
+    public List<CourseScheduleEnum> getCourseType() {
         return courseType;
     }
 
-    public void setCourseType(CourseScheduleEnum courseType) {
+    public void setCourseType(List<CourseScheduleEnum> courseType) {
         this.courseType = courseType;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseHomeworkService.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkReviewDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSubmitDto;
+import com.yonge.cooleshow.biz.dal.dto.CourseScheduleHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkAdminSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo;
 
 /**
  * 课程作业表 服务类
@@ -34,9 +36,10 @@ public interface CourseHomeworkService extends IService<CourseHomework>  {
 	 * 课程详情 课后作业信息
 	 *
 	 * @param courseId 课程id
+	 * @param studentId
 	 * @return 课后作业信息
 	 */
-	CourseHomeworkDetailVo getCourseHomeworkDetailByCourseId(Long courseId);
+	CourseHomeworkDetailVo getCourseHomeworkDetailByCourseId(Long courseId, Long studentId);
 
 	/**
 	 * 老师布置作业
@@ -72,4 +75,11 @@ public interface CourseHomeworkService extends IService<CourseHomework>  {
 	IPage<CourseHomeworkVo>  selectAdminPage(IPage<CourseHomeworkVo> page, HomeworkAdminSearch query);
 
 
+	/**
+	 * 琴房课-课后作业信息
+	 *
+	 * @param query 课程id
+	 * @return
+	 */
+	CourseScheduleHomeworkVo getCourseHomeworkDetailByCourseId(CourseScheduleHomeworkSearch query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseScheduleStudentPaymentService.java

@@ -5,9 +5,7 @@ import com.yonge.cooleshow.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkCustomMessage;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkRoomMusicSheetDownloadData;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
-import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -38,7 +36,7 @@ public interface CourseScheduleStudentPaymentService extends IService<CourseSche
      * @param courseId 课程id
      * @return 购买记录
      */
-    CourseScheduleStudentPayment getByCourseId(Long courseId);
+    List<CourseScheduleStudentPayment> getByCourseId(Long courseId);
 
     /**
      * 查询购买直播课的订单

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseHomeworkServiceImpl.java

@@ -8,19 +8,22 @@ import com.yonge.cooleshow.biz.dal.dao.CourseHomeworkDao;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkReviewDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSubmitDto;
+import com.yonge.cooleshow.biz.dal.dto.CourseScheduleHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkAdminSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
-import com.yonge.cooleshow.biz.dal.entity.SysMessageConfig;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentHomeworkVo;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.slf4j.Logger;
@@ -35,7 +38,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 
 @Service
@@ -57,9 +59,6 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     private SysUserFeignService sysUserFeignService;
 
     @Autowired
-    private SysMessageConfigService sysMessageConfigService;
-
-    @Autowired
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
 
 	@Override
@@ -75,6 +74,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         if (CollectionUtils.isEmpty(records)) {
             return courseHomeworkVoIPage;
         }
+
         // 学生信息
         List<CourseHomeworkVo> studentInfoList = baseMapper.selectStudentInfo(records);
 
@@ -82,7 +82,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         List<CourseHomeworkVo> teacherInfoList = baseMapper.selectTeacherInfo(records);
 
         // 声部信息
-        List<CourseHomeworkVo> subjectList = baseMapper.selectSubjectInfoList(records);
+        List<CourseHomeworkVo> subjectList = baseMapper.selectSubjectAndGroupInfoList(records);
         for (int i = 0; i < records.size(); i++) {
             records.get(i).setStudentId(studentInfoList.get(i).getStudentId());
             records.get(i).setStudentAvatar(studentInfoList.get(i).getStudentAvatar());
@@ -92,19 +92,24 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
             records.get(i).setTeacherId(teacherInfoList.get(i).getTeacherId());
             records.get(i).setTeacherName(teacherInfoList.get(i).getTeacherName());
             records.get(i).setAbsenteeism(teacherInfoList.get(i).getAbsenteeism());
+            records.get(i).setCourseGroupName(subjectList.get(i).getCourseGroupName());
         }
         return courseHomeworkVoIPage;
     }
 
     @Override
-    public CourseHomeworkDetailVo getCourseHomeworkDetailByCourseId(Long courseId) {
+    public CourseHomeworkDetailVo getCourseHomeworkDetailByCourseId(Long courseId, Long studentId) {
 
         // 课程基本信息
-        CourseHomeworkDetailVo courseHomeworkDetailVo = baseMapper.selectCourseHomeworkDetailByCourseId(courseId);
+        CourseHomeworkDetailVo courseHomeworkDetailVo = baseMapper.selectCourseHomeworkDetailByCourseId(courseId,studentId);
+
+        if (courseHomeworkDetailVo == null) {
+            throw  new BizException("未找到作业信息");
+        }
 
         // 学生信息
         CourseHomeworkDetailVo studentInfoDetailVo = baseMapper
-                .selectPaymentStudentInfo(courseHomeworkDetailVo.getCourseScheduleId());
+                .selectPaymentStudentInfo(courseHomeworkDetailVo.getCourseScheduleId(),studentId);
 
         // 声部信息
         CourseHomeworkDetailVo subjectAndTeacherInfoVo = baseMapper
@@ -158,17 +163,26 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
      * @param teacherId 老师id
      */
     private void sendDecorateHomework(Long courseScheduleId,Long teacherId) {
-        CourseScheduleStudentPayment courseScheduleStudentPayment = courseScheduleStudentPaymentService.getByCourseId(
+        List<CourseScheduleStudentPayment> paymentList = courseScheduleStudentPaymentService.getByCourseId(
                 courseScheduleId);
-        SysUser student = sysUserFeignService.queryUserById(courseScheduleStudentPayment.getUserId());
+        if (paymentList.isEmpty()) {
+            return;
+        }
         SysUser teacher = sysUserFeignService.queryUserById(teacherId);
-        Map<Long,String> studentReceivers = new HashMap<>();
-        studentReceivers.put(student.getId(), student.getPhone());
-
         String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TEACHER_DECORATE_HOMEWORK.getCode());
+        for (CourseScheduleStudentPayment courseScheduleStudentPayment : paymentList) {
+            SysUser student = sysUserFeignService.queryUserById(courseScheduleStudentPayment.getUserId());
+            Map<Long,String> studentReceivers = new HashMap<>();
+            studentReceivers.put(student.getId(), student.getPhone());
 
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_DECORATE_HOMEWORK,
-         studentReceivers, null, 0,url + courseScheduleId , ClientEnum.STUDENT.getCode(),teacher.getUsername());
+            try {
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum
+                       .TEACHER_DECORATE_HOMEWORK,studentReceivers, null, 0,url + courseScheduleId ,
+                       ClientEnum.STUDENT.getCode(),teacher.getUsername());
+            } catch (Exception e) {
+                log.warn("老师布置作业消息发送失败  学生id：{}",student.getId());
+            }
+        }
     }
 
     /**
@@ -180,7 +194,6 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     private CourseHomework checkHasHomework(Long courseScheduleId) {
         List<CourseHomework> list = this.lambdaQuery()
                                         .eq(CourseHomework::getCourseScheduleId, courseScheduleId)
-                                        .eq(CourseHomework::getCourseGroupType, CourseScheduleEnum.PRACTICE.getCode())
                                         .list();
         if (CollectionUtils.isEmpty(list)) {
             return null;
@@ -201,7 +214,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
 
         // 课程基本信息
         CourseHomeworkDetailVo courseHomeworkDetailVo = baseMapper
-                .selectCourseHomeworkDetailByCourseId(reviewDto.getCourseScheduleId());
+                .selectCourseHomeworkDetailByCourseId(reviewDto.getCourseScheduleId(), reviewDto.getStudentId());
 
         // 检查学生是否提交作业
         if (!YesOrNoEnum.YES.getCode().equals(courseHomeworkDetailVo.getSubmitHomework().getCode())) {
@@ -242,7 +255,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         }
         // 课程基本信息
         CourseHomeworkDetailVo courseHomeworkDetailVo = baseMapper
-                .selectCourseHomeworkDetailByCourseId(submitDto.getCourseScheduleId());
+                .selectCourseHomeworkDetailByCourseId(submitDto.getCourseScheduleId(), submitDto.getStudentId());
 
         // 检查老师是否评价作业
         if (YesOrNoEnum.YES.getCode().equals(courseHomeworkDetailVo.getReviewHomework().getCode())) {
@@ -287,22 +300,25 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
 
     @Override
     public IPage<CourseHomeworkVo> selectAdminPage(IPage<CourseHomeworkVo> page, HomeworkAdminSearch query) {
-        IPage<CourseHomeworkVo> courseHomeworkVoIPage = page.setRecords(baseMapper.selectAdminPage(page, query));
+        return page.setRecords(baseMapper.selectAdminPage(page, query));
+    }
 
-        List<CourseHomeworkVo> records = courseHomeworkVoIPage.getRecords();
-        List<Long> courseIdList = records
-                      .stream()
-                      .map(CourseHomeworkVo::getCourseId)
-                      .collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(courseIdList)) {
-            return courseHomeworkVoIPage;
-        }
-        // 查询提交时间
-        List<CourseHomeworkVo> courseHomeworkVoList = baseMapper.selectSubmitTime(courseIdList);
-        for (int i = 0; i < records.size(); i++) {
-            records.get(i).setSubmitTime(courseHomeworkVoList.get(i).getSubmitTime());
+    @Override
+    public CourseScheduleHomeworkVo getCourseHomeworkDetailByCourseId(CourseScheduleHomeworkSearch query) {
+        //  查询课程作业信息
+        CourseScheduleHomeworkVo courseScheduleHomeworkVo = baseMapper
+                .selectCourseHomeworkByCourseId(query.getCourseId());
+        if (courseScheduleHomeworkVo == null) {
+            return courseScheduleHomeworkVo;
         }
-        return courseHomeworkVoIPage;
+
+        // 课程人员作业
+        IPage<StudentHomeworkVo> studentHomeworkList = baseMapper
+                .selectStudentHomeworkByCourseId(PageUtil.getPage(query),query.getCourseId());
+
+        courseScheduleHomeworkVo.setStudentHomeworkList(studentHomeworkList);
+        return courseScheduleHomeworkVo;
+
     }
 
     /**
@@ -313,8 +329,9 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     private void checkCourseSchedule(Long courseScheduleId) {
         // 1. 检查课程类型
         CourseSchedule courseSchedule = courseScheduleService.getById(courseScheduleId);
-        if (!CourseScheduleEnum.PRACTICE.getCode().equals(courseSchedule.getType())) {
-            throw  new BizException("非陪练课，不能布置课后作业");
+        if (!CourseScheduleEnum.PRACTICE.getCode().equals(courseSchedule.getType())
+                && !CourseScheduleEnum.PIANO_ROOM_CLASS.getCode().equals(courseSchedule.getType())) {
+            throw new BizException("不能布置课后作业");
         }
         // 2. 检查课程结束
         if (!CourseScheduleEnum.COMPLETE.getCode().equals(courseSchedule.getStatus())) {
@@ -333,7 +350,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         CourseHomework courseHomework = new CourseHomework();
         courseHomework.setId(saveDto.getCourseHomeworkId());
         courseHomework.setCourseGroupId(courseSchedule.getCourseGroupId());
-        courseHomework.setCourseGroupType(CourseScheduleEnum.PRACTICE.getCode());
+        courseHomework.setCourseGroupType(courseSchedule.getType());
         courseHomework.setCourseScheduleId(saveDto.getCourseScheduleId());
         courseHomework.setTitle(saveDto.getTitle());
         courseHomework.setContent(saveDto.getContent());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -737,6 +737,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     @Override
     public boolean checkTeacherCourseSchedule(Long teacherId, Long courseId) {
         CourseSchedule courseSchedule = this.getById(courseId);
+        if (courseSchedule == null) {
+            return false;
+        }
         return teacherId.equals(courseSchedule.getTeacherId());
     }
 
@@ -751,9 +754,13 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
     @Override
     public boolean checkStudentCourseSchedule(Long studentId, Long courseId) {
-        CourseScheduleStudentPayment courseScheduleStudentPayment = courseScheduleStudentPaymentService
-                .getByCourseId(courseId);
-        return courseScheduleStudentPayment != null && studentId.equals(courseScheduleStudentPayment.getUserId());
+        List<CourseScheduleStudentPayment> paymentList = courseScheduleStudentPaymentService.getByCourseId(courseId);
+        for (CourseScheduleStudentPayment courseScheduleStudentPayment : paymentList) {
+            if (courseScheduleStudentPayment != null && studentId.equals(courseScheduleStudentPayment.getUserId())) {
+                return true;
+            }
+        }
+        return false;
 
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleStudentPaymentServiceImpl.java

@@ -10,15 +10,14 @@ import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleStudentPaymentService;
 import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -52,17 +51,19 @@ public class CourseScheduleStudentPaymentServiceImpl extends ServiceImpl<CourseS
     }
 
     @Override
-    public CourseScheduleStudentPayment getByCourseId(Long courseId) {
+    public List<CourseScheduleStudentPayment> getByCourseId(Long courseId) {
+        List<CourseScheduleEnum> courseScheduleEnumList = new ArrayList<>();
+        courseScheduleEnumList.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
+        courseScheduleEnumList.add(CourseScheduleEnum.PRACTICE);
         List<CourseScheduleStudentPayment> list = this.lambdaQuery()
                 .eq(CourseScheduleStudentPayment::getCourseId, courseId)
-                .eq(CourseScheduleStudentPayment::getCourseType,
-                        CourseScheduleEnum.PRACTICE.getCode())
+                .in(CourseScheduleStudentPayment::getCourseType,courseScheduleEnumList)
                 .isNotNull(CourseScheduleStudentPayment::getUserId)
                 .list();
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
-        return list.get(0);
+        return list;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseHomeworkVo.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,10 +20,25 @@ public class CourseHomeworkVo{
 	@ApiModelProperty("课程编号ID")
 	private Long courseId;
 
+	@ApiModelProperty("课后作业id")
+	private Long homeworkId;
+
 
 	@ApiModelProperty("课程组ID")
 	private Long courseGroupId;
 
+	@ApiModelProperty("课程组名")
+	private String courseGroupName;
+
+	@ApiModelProperty("课程背景图")
+	private String backgroundPic;
+
+	@ApiModelProperty("课程类型")
+	private CourseScheduleEnum type;
+
+	@ApiModelProperty("课堂编号-第几堂课")
+	private Integer classNum;
+
 
 	@ApiModelProperty("上课日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -188,4 +204,44 @@ public class CourseHomeworkVo{
 	public void setAbsenteeism(YesOrNoEnum absenteeism) {
 		this.absenteeism = absenteeism;
 	}
+
+	public CourseScheduleEnum getType() {
+		return type;
+	}
+
+	public void setType(CourseScheduleEnum type) {
+		this.type = type;
+	}
+
+	public Long getHomeworkId() {
+		return homeworkId;
+	}
+
+	public void setHomeworkId(Long homeworkId) {
+		this.homeworkId = homeworkId;
+	}
+
+	public Integer getClassNum() {
+		return classNum;
+	}
+
+	public void setClassNum(Integer classNum) {
+		this.classNum = classNum;
+	}
+
+	public String getCourseGroupName() {
+		return courseGroupName;
+	}
+
+	public void setCourseGroupName(String courseGroupName) {
+		this.courseGroupName = courseGroupName;
+	}
+
+	public String getBackgroundPic() {
+		return backgroundPic;
+	}
+
+	public void setBackgroundPic(String backgroundPic) {
+		this.backgroundPic = backgroundPic;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseScheduleHomeworkVo.java

@@ -0,0 +1,207 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-31
+ */
+@ApiModel("琴房课程-课后作业列表")
+public class CourseScheduleHomeworkVo {
+
+
+    @ApiModelProperty("课程编号ID")
+    private Long courseId;
+
+    @ApiModelProperty("课程组ID")
+    private Long courseGroupId;
+
+    @ApiModelProperty("课程组名")
+    private String courseGroupName;
+
+    @ApiModelProperty("课程类型")
+    private CourseScheduleEnum type;
+
+    @ApiModelProperty("课堂编号-第几堂课")
+    private Integer classNum;
+
+
+    @ApiModelProperty("上课日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    private Date classDate;
+
+    @ApiModelProperty("上课时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date startTime;
+
+    @ApiModelProperty("下课时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date endTime;
+
+    @ApiModelProperty("声部名称")
+    private String subjectName;
+
+    @ApiModelProperty("作业标题; ")
+    private String title;
+
+    @ApiModelProperty("作业内容 ")
+    private String content;
+
+    @ApiModelProperty("作业附件地址（多个用逗号分隔） ")
+    private String attachments;
+
+    @ApiModelProperty("布置作业，0：未布置，1：已布置")
+    private YesOrNoEnum decorateHomework;
+
+    @ApiModelProperty("作业布置时间")
+    private Date decorateTime;
+
+    @ApiModelProperty("课程背景图")
+    private String backgroundPic;
+
+    @ApiModelProperty("学生课后作业列表")
+    private IPage<StudentHomeworkVo> studentHomeworkList;
+
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getCourseGroupId() {
+        return courseGroupId;
+    }
+
+    public void setCourseGroupId(Long courseGroupId) {
+        this.courseGroupId = courseGroupId;
+    }
+
+    public String getCourseGroupName() {
+        return courseGroupName;
+    }
+
+    public void setCourseGroupName(String courseGroupName) {
+        this.courseGroupName = courseGroupName;
+    }
+
+    public CourseScheduleEnum getType() {
+        return type;
+    }
+
+    public void setType(CourseScheduleEnum type) {
+        this.type = type;
+    }
+
+    public Integer getClassNum() {
+        return classNum;
+    }
+
+    public void setClassNum(Integer classNum) {
+        this.classNum = classNum;
+    }
+
+    public Date getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(Date classDate) {
+        this.classDate = classDate;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(String attachments) {
+        this.attachments = attachments;
+    }
+
+    public YesOrNoEnum getDecorateHomework() {
+        return decorateHomework;
+    }
+
+    public void setDecorateHomework(YesOrNoEnum decorateHomework) {
+        this.decorateHomework = decorateHomework;
+    }
+
+    public Date getDecorateTime() {
+        return decorateTime;
+    }
+
+    public void setDecorateTime(Date decorateTime) {
+        this.decorateTime = decorateTime;
+    }
+
+    public String getBackgroundPic() {
+        return backgroundPic;
+    }
+
+    public void setBackgroundPic(String backgroundPic) {
+        this.backgroundPic = backgroundPic;
+    }
+
+    public IPage<StudentHomeworkVo> getStudentHomeworkList() {
+        return studentHomeworkList;
+    }
+
+    public void setStudentHomeworkList(IPage<StudentHomeworkVo> studentHomeworkList) {
+        this.studentHomeworkList = studentHomeworkList;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomeworkVo.java

@@ -0,0 +1,59 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-31
+ */
+@ApiModel("学生课后作业信息")
+public class StudentHomeworkVo {
+
+    @ApiModelProperty("学生id")
+    private Long studentId;
+
+    @ApiModelProperty("学员姓名")
+    private String studentName;
+
+    @ApiModelProperty("学员头像")
+    private String studentAvatar;
+
+    @ApiModelProperty("学生提交作业 0：未提交，1：已提交")
+    private YesOrNoEnum submitHomework;
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentAvatar() {
+        return studentAvatar;
+    }
+
+    public void setStudentAvatar(String studentAvatar) {
+        this.studentAvatar = studentAvatar;
+    }
+
+    public YesOrNoEnum getSubmitHomework() {
+        return submitHomework;
+    }
+
+    public void setSubmitHomework(YesOrNoEnum submitHomework) {
+        this.submitHomework = submitHomework;
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -42,26 +42,34 @@
         cs.id_ AS courseId,
         cs.course_group_id_ AS courseGroupId,
         cs.class_date_ AS classDate,
+        cs.type_ as type,
         cs.start_time_ AS startTime,
         cs.end_time_ AS endTime,
         ch.create_time_ as decorateTime,
+        su2.id_ as studentId,
         su2.username_ as studentName,
         su2.avatar_ as studentAvatar,
         su.username_ as teacherName,
         su.avatar_ as teacherAvatar,
+        sch.submit_time_ as submitTime,
+        su.id_ as teacherId,
         ch.create_time_ as decorateTime
         from  course_homework ch
         left join course_schedule cs on ch.course_schedule_id_ = cs.id_
         left join course_schedule_student_payment cssp on cssp.course_id_ = cs.id_
         left join sys_user su on cs.teacher_id_ = su.id_
         left join sys_user su2 on cssp.user_id_ = su2.id_
+        left join student_course_homework sch on ch.id_ = sch.id_
         <where>
             <if test="param.courseStatus != null">
-                and cs.type_ = #{param.courseType}
-            </if>
-            <if test="param.courseType != null">
                 and cs.status_ = #{param.courseStatus}
             </if>
+            <if test="param.courseType != null and param.courseType.size() != 0">
+                and  cs.type_ in
+                <foreach collection="param.courseType" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.startTime != null">
                 and #{param.startTime} &lt; ch.create_time_
             </if>
@@ -83,14 +91,15 @@
     </select>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
-        select
+        select distinct
         cs.id_ AS courseId,
         cs.course_group_id_ AS courseGroupId,
         cs.class_date_ AS classDate,
+        cs.class_num_ as classNum,
         cs.start_time_ AS startTime,
         cs.end_time_ AS endTime,
-        ch.create_time_ as decorateTime,
-        sch.submit_time_ as submitTime
+        cs.type_ as type,
+        ch.create_time_ as decorateTime
         from course_schedule cs
         left join course_homework ch on ch.course_schedule_id_ = cs.id_
         left join student_course_homework sch on ch.id_ = sch.course_homework_id_
@@ -113,11 +122,14 @@
                 </if>
             </if>
             <if test="param.courseStatus != null">
-                and cs.type_ = #{param.courseType}
-            </if>
-            <if test="param.courseType != null">
                 and cs.status_ = #{param.courseStatus}
             </if>
+            <if test="param.courseType != null and param.courseType.size() != 0">
+                and cs.type_ in
+                <foreach collection="param.courseType" separator="," close=")" open="(" item="item" >
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.teacherId != null">
                 and cs.teacher_id_ = #{param.teacherId}
             </if>
@@ -166,9 +178,13 @@
         from course_schedule cs
         left join course_homework ch on ch.course_schedule_id_ = cs.id_
         left join student_course_homework sch on ch.id_ = sch.course_homework_id_
+        left join course_schedule_student_payment cssp on cs.id_ = cssp.course_id_
         <where>
             <if test="courseId != null">
-                cs.id_ = #{courseId}
+                and cs.id_ = #{courseId}
+            </if>
+            <if test="studentId != null">
+                and cssp.user_id_ = #{studentId}
             </if>
         </where>
     </select>
@@ -184,6 +200,9 @@
             <if test="courseScheduleId != null">
                 and cs.id_ = #{courseScheduleId}
             </if>
+            <if test="studentId != null">
+                and cssp.user_id_ = #{studentId}
+            </if>
         </where>
     </select>
 
@@ -204,7 +223,8 @@
     </select>
 
 	<select id="selectStudentInfo" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
-        select
+        select distinct
+        cs.id_,
         cssp.user_id_ as studentId
         ,su.username_ as studentName
         ,su.avatar_ as studentAvatar
@@ -227,9 +247,11 @@
         </if>
     </select>
 
-	<select id="selectSubjectInfoList" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
+	<select id="selectSubjectAndGroupInfoList" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
         select
         s.name_ as subjectName
+        ,cg.name_ as courseGroupName
+        ,cg.background_pic_ as backgroundPic
         from course_schedule cs
         left join course_group cg on cs.course_group_id_ = cg.id_
         left join subject s on s.id_ = cg.subject_id_
@@ -274,25 +296,45 @@
         </if>
     </select>
 
-	<select id="selectSubmitTime" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
+	<select id="selectCourseHomeworkByCourseId" resultType="com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo">
         select
-        cs.id_ as courseId,
-        sch.submit_time_ as submitTime
-        from course_schedule cs
-        left join  student_course_homework sch on sch.course_schedule_id_ = cs.id_
+            cs.id_ as courseId,
+            cg.id_ as courseGroupId,
+            cg.name_ as courseGroupName,
+            cs.type_ as type,
+            cs.class_num_ as classNum,
+            cs.class_date_ as classDate,
+            cs.start_time_ as startTime,
+            cs.end_time_ as endTime,
+            s.name_ as subjectName,
+            ch.title_ as title,
+            ch.content_ as content,
+            ch.attachments_ as attachments,
+        if(ch.id_ is null,0,1) as decorateHomework,
+        ch.create_time_ as decorateTime,
+        cg.background_pic_ as backgroundPic
+        from course_schedule  cs
+        left join course_group cg on cs.course_group_id_ = cg.id_
+        left join course_homework ch on cs.id_ = ch.course_schedule_id_
+        left join subject s on cg.subject_id_ = s.id_
+        where cs.id_ = #{courseId}
+
+    </select>
+
+	<select id="selectStudentHomeworkByCourseId" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomeworkVo">
+        select
+        s.id_ as studentId,
+        s.username_ as studentName,
+        s.phone_ as studentAvatar,
+        if(sch.id_ is not null,1,0) as submitHomework
+
+        from course_schedule_student_payment cssp
+        left join sys_user s on cssp.user_id_ = s.id_
+        left join student_course_homework sch on cssp.user_id_ = sch.student_id_
         <where>
-            <if test="courseIdList != null and courseIdList.size() != 0">
-                and cs.id_ in
-                <foreach collection="courseIdList" separator="," close=")" open="(" item="item">
-                    #{item}
-                </foreach>
+            <if test="courseId != null">
+                and cssp.course_id_ = #{courseId}
             </if>
         </where>
-        <if test="courseIdList != null and courseIdList.size() != 0">
-            order by field(cs.id_,
-            <foreach collection="courseIdList" separator="," close=")" open="" item="item" >
-                #{item}
-            </foreach>
-        </if>
     </select>
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/CourseHomeworkController.java

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Description 学生课后作业相关接口
@@ -51,7 +53,7 @@ public class CourseHomeworkController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         HttpResponseResult info = checkCourseSchedule(courseId,sysUser);
         if (info != null) return info;
-        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId));
+        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, sysUser.getId()));
     }
 
     private HttpResponseResult checkCourseSchedule(Long courseId,SysUser sysUser) {
@@ -85,7 +87,10 @@ public class CourseHomeworkController extends BaseController {
         query.setDecorate(YesOrNoEnum.YES);
         query.setStudentId(sysUser.getId());
         query.setCourseStatus(CourseScheduleEnum.COMPLETE);
-        query.setCourseType(CourseScheduleEnum.PRACTICE);
+        List<CourseScheduleEnum> list = new ArrayList<>();
+        list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
+        list.add(CourseScheduleEnum.PRACTICE);
+        query.setCourseType(list);
         return succeed(PageUtil.pageInfo(courseHomeworkService.selectPage(PageUtil.getPage(query),query)));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/CourseHomeworkController.java

@@ -4,6 +4,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkReviewDto;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSaveDto;
+import com.yonge.cooleshow.biz.dal.dto.CourseScheduleHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
@@ -13,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.CountVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
@@ -23,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Description 老师课后作业相关接口
@@ -52,10 +56,13 @@ public class CourseHomeworkController extends BaseController {
             return failed("用户信息获取失败");
         }
         HomeworkSearch homeworkSearch = new HomeworkSearch();
-        // 默认查当前老师，陪练课 课程状态为完成，有学生考勤记录 没有学生课程记录
+        // 默认查当前老师，陪练课 课程状态为完成， 没有学生课程记录
         homeworkSearch.setTeacherId(sysUser.getId());
         homeworkSearch.setCourseStatus(CourseScheduleEnum.COMPLETE);
-        homeworkSearch.setCourseType(CourseScheduleEnum.PRACTICE);
+        List<CourseScheduleEnum> list = new ArrayList<>();
+        list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
+        list.add(CourseScheduleEnum.PRACTICE);
+        homeworkSearch.setCourseType(list);
         homeworkSearch.setDecorate(YesOrNoEnum.NO);
         Integer integer = courseScheduleService.countTeacherNoDecorateHomework(homeworkSearch);
         CountVo countVo = new CountVo();
@@ -64,14 +71,26 @@ public class CourseHomeworkController extends BaseController {
     }
 
     @ApiOperation(value = "首页-我的课程-课程详情(陪练课)-课后作业信息详情",notes = "传入课程编号ID")
-    @GetMapping(value = "/detail/{courseId}")
+    @GetMapping(value = "/detail/{courseId}/{studentId}")
     public HttpResponseResult<CourseHomeworkDetailVo> detail(@ApiParam(value = "课程编号ID", required = true)
-                                                                 @PathVariable("courseId") Long courseId) {
+                                                                 @PathVariable("courseId") Long courseId,
+                                                             @PathVariable("studentId") Long studentId) {
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         HttpResponseResult info = checkCourseSchedule(courseId,sysUser);
         if (info != null) return info;
-        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId));
+        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, studentId));
+    }
+
+
+    @ApiOperation(value = "首页-我的课程-课程详情(琴房)-课后作业列表",notes = "传入课程编号ID")
+    @PostMapping(value = "/detail/homework")
+    public HttpResponseResult<CourseScheduleHomeworkVo> detail(@RequestBody @Valid CourseScheduleHomeworkSearch query) {
+
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        HttpResponseResult info = checkCourseSchedule(query.getCourseId(),sysUser);
+        if (info != null) return info;
+        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(query));
     }
 
     private HttpResponseResult checkCourseSchedule(Long courseId,SysUser sysUser) {
@@ -113,7 +132,11 @@ public class CourseHomeworkController extends BaseController {
         }
         query.setTeacherId(sysUser.getId());
         query.setCourseStatus(CourseScheduleEnum.COMPLETE);
-        query.setCourseType(CourseScheduleEnum.PRACTICE);
+        List<CourseScheduleEnum> list = new ArrayList<>();
+        list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
+        list.add(CourseScheduleEnum.PRACTICE);
+        query.setCourseType(list);
+
         return succeed(PageUtil.pageInfo(courseHomeworkService.selectPage(PageUtil.getPage(query),query)));
     }