add:课程详情-作业

切

切

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

@@ -4,27 +4,47 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
 import com.yonge.cooleshow.biz.dal.dto.search.CourseHomeworkSearch;
 
 
-public interface CourseHomeworkDao extends BaseMapper<CourseHomework>{
+public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	/**
 	 * 查询详情
-     * @author liweifan
-     * @date 2022-03-30 13:53:51
-     * @return: com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo
+	 *
+	 * @author liweifan
+	 * @date 2022-03-30 13:53:51
+	 * @return: com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo
 	 */
 	CourseHomeworkVo detail(@Param("id") Long id);
 
 	/**
 	 * 分页查询
-     * @author liweifan
-     * @date 2022-03-30 13:53:51
-     * @return: com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo
+	 *
+	 * @author liweifan
+	 * @date 2022-03-30 13:53:51
+	 * @return: com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo
 	 */
 	List<CourseHomeworkVo> selectPage(@Param("page") IPage page, @Param("param") CourseHomeworkSearch courseHomework);
-	
+
+	/**
+	 * 课程详情 课后作业信息
+	 *
+	 * @param courseId 课程id
+	 * @return 课后作业信息
+	 */
+    CourseHomeworkDetailVo selectCourseHomeworkDetailByCourseId(@Param("courseId") Long courseId);
+
+	/**
+	 * 获取课程购买的用户信息
+	 *
+	 * @param courseGroupId    课程组id
+	 * @param courseScheduleId 课程id
+	 * @return 购买用户信息
+	 */
+	CourseHomeworkDetailVo selectPaymentStudentInfo(@Param("courseGroupId") Long courseGroupId,
+													@Param("courseScheduleId") Long courseScheduleId);
 }

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

@@ -76,7 +76,7 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
     /**
      * 老师未布置的课程作业数量
      * <p>
-     * 陪练课 课程状态为完成，有学生考勤记录 没有学生课程记录
+     * 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
      *
      * @param param 查询条件
      * @return number

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

@@ -0,0 +1,47 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description 老师作业点评
+ *
+ * @author liujunchi
+ * @date 2022-04-14
+ */
+@ApiModel("老师作业点评")
+public class CourseHomeworkReviewDto {
+
+    @ApiModelProperty(value = "课程ID",required = true)
+    private Long courseScheduleId;
+
+    @ApiModelProperty(value = "点评信息",required = true)
+    private String review;
+
+    @ApiModelProperty("老师id")
+    private Long teacherId;
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getReview() {
+        return review;
+    }
+
+    public void setReview(String review) {
+        this.review = review;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description 布置作业
+ *
+ * @author liujunchi
+ * @date 2022-04-14
+ */
+@ApiModel("布置作业信息")
+public class CourseHomeworkSaveDto {
+
+    @ApiModelProperty(value = "课程编号",required = true)
+    @NotNull(message = "课程编号不能为空")
+    private Long courseScheduleId;
+
+    @ApiModelProperty(value = "作业标题",required = true)
+    @NotBlank(message = "作业标题不能为空")
+    private String title;
+
+    @ApiModelProperty(value = "作业内容",required = true)
+    @NotBlank(message = "作业内容不能为空")
+    private String content;
+
+    @ApiModelProperty("作业附件地址（多个用逗号分隔）")
+    private String attachments;
+
+    @ApiModelProperty(value = "老师id",hidden = true)
+    private Long teacherId;
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    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 Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+}

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

@@ -15,18 +15,29 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel("课后作业查询条件")
 public class HomeworkSearch extends QueryInfo {
 
-    @ApiModelProperty("老师id")
+    @ApiModelProperty(value = "老师id",hidden = true)
     private Long teacherId;
 
-    @ApiModelProperty("课程类型： PRACTICE 陪练课； LIVE 直播课")
+    @ApiModelProperty(value = "课程类型： PRACTICE 陪练课； LIVE 直播课",hidden = true)
     private CourseScheduleEnum courseType;
 
-    @ApiModelProperty("课程状态： NOT_START:未开始； ING:进行中； COMPLETE:已完成； CANCEL:已取消")
+    @ApiModelProperty(value = "课程状态： NOT_START:未开始； ING:进行中； COMPLETE:已完成； CANCEL:已取消",hidden = true)
     private CourseScheduleEnum courseStatus;
 
     @ApiModelProperty("布置作业 0:否，1:是")
     private YesOrNoEnum decorate;
 
+    @ApiModelProperty(value = "课程编号ID",hidden = true)
+    private Long courseScheduleId;
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
     public Long getTeacherId() {
         return teacherId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CourseScheduleEnum.java

@@ -1,5 +1,7 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -17,6 +19,7 @@ public enum CourseScheduleEnum {
     COMPLETE("COMPLETE", "已完成"),
     CANCEL("CANCEL", "已取消");
 
+    @EnumValue
     private String code;
 
     private String msg;

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

@@ -2,6 +2,9 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
 import com.yonge.cooleshow.biz.dal.dto.search.CourseHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
@@ -26,4 +29,28 @@ public interface CourseHomeworkService extends IService<CourseHomework>  {
  	 * @date 2022-03-30
      */
     IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, CourseHomeworkSearch query);
+
+	/**
+	 * 课程详情 课后作业信息
+	 *
+	 * @param courseId 课程id
+	 * @return 课后作业信息
+	 */
+	CourseHomeworkDetailVo getCourseHomeworkDetailByCourseId(Long courseId);
+
+	/**
+	 * 老师布置作业
+	 *
+	 * @param saveDto 作业信息
+	 * @return boolean
+	 */
+    boolean decorateCourseHomework(CourseHomeworkSaveDto saveDto);
+
+	/**
+	 * 老师点评学生课后作业
+	 *
+	 * @param reviewDto 点评信息
+	 * @return boolean
+	 */
+    boolean reviewCourseHomework(CourseHomeworkReviewDto reviewDto);
 }

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

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseCalendarEntity;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.vo.MyCourseVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherLiveCourseInfoVo;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -137,7 +138,7 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     /**
      * 老师未布置的课程作业数量
-     * 陪练课 课程状态为完成，有学生考勤记录 没有学生课程记录
+     * 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
      *
      * @param homeworkSearch 查询信息
      * @return number
@@ -148,5 +149,13 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     IPage<MyCourseVo> queryStudentPracticeCourse(IPage<MyCourseVo> page, MyCourseSearch search);
 
+    /**
+     * 检查课程是否属于老师
+     *
+     * @param teacherId 老师id
+     * @param courseId 课程id
+     * @return boolean true 属于老师
+     */
+    boolean checkCourseSchedule(Long teacherId, Long courseId);
 }
 

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
@@ -26,4 +27,13 @@ public interface StudentAttendanceService extends IService<StudentAttendance>  {
  	 * @date 2022-03-30
      */
     IPage<StudentAttendanceVo> selectPage(IPage<StudentAttendanceVo> page, StudentAttendanceSearch query);
+
+	/**
+	 * 获取学生考勤信息
+	 *
+	 * @param courseType 课程类型 PRACTICE：陪练课、LIVE：直播课
+	 * @param courseScheduleId 课程id
+	 * @return 考勤对象
+	 */
+    StudentAttendance getByCourseTypeAndScheduleId(CourseScheduleEnum courseType, Long courseScheduleId);
 }

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

@@ -2,17 +2,40 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
-import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
-import com.yonge.cooleshow.biz.dal.dto.search.CourseHomeworkSearch;
 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.search.CourseHomeworkSearch;
+import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
+import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
+import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+import com.yonge.cooleshow.biz.dal.service.StudentAttendanceService;
+import com.yonge.cooleshow.biz.dal.service.StudentCourseHomeworkService;
+import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
+import com.yonge.cooleshow.common.exception.BizException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
 
 
 @Service
 public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, CourseHomework> implements CourseHomeworkService {
 
+    @Autowired
+    private CourseScheduleService courseScheduleService;
+
+    @Autowired
+    private StudentAttendanceService studentAttendanceService;
+
+    @Autowired
+    private StudentCourseHomeworkService studentCourseHomeworkService;
+
 	@Override
     public CourseHomeworkVo detail(Long id) {
         CourseHomeworkVo detail = baseMapper.detail(id);
@@ -23,5 +46,118 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     public IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, CourseHomeworkSearch query){
         return page.setRecords(baseMapper.selectPage(page, query));
     }
-	
+
+    @Override
+    public CourseHomeworkDetailVo getCourseHomeworkDetailByCourseId(Long courseId) {
+
+        // 课程基本信息
+        CourseHomeworkDetailVo courseHomeworkDetailVo = baseMapper.selectCourseHomeworkDetailByCourseId(courseId);
+
+        // 学生信息
+        CourseHomeworkDetailVo studentInfoDetailVo = baseMapper
+                .selectPaymentStudentInfo(courseHomeworkDetailVo.getCourseGroupId(),courseHomeworkDetailVo.getCourseScheduleId());
+
+        // 拼接数据
+        courseHomeworkDetailVo.setStudentName(studentInfoDetailVo.getStudentName());
+        courseHomeworkDetailVo.setStudentAvatar(studentInfoDetailVo.getStudentAvatar());
+        courseHomeworkDetailVo.setSubjectName(studentInfoDetailVo.getSubjectName());
+        return courseHomeworkDetailVo;
+    }
+
+    @Override
+    public boolean decorateCourseHomework(CourseHomeworkSaveDto saveDto) {
+        // 检查 老师 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
+        checkCourseSchedule(saveDto.getCourseScheduleId());
+
+        // 检查已经布置了课后作业
+        if (checkHasHomework(saveDto.getCourseScheduleId())) {
+            throw  new BizException("已布置作业");
+        }
+
+        CourseSchedule courseSchedule = courseScheduleService.getById(saveDto.getCourseScheduleId());
+        // 创建课后作业
+        CourseHomework courseHomework = getCourseHomework(saveDto, courseSchedule);
+
+        return this.save(courseHomework);
+    }
+
+    /**
+     * 检查课程是否已经布置作业
+     *
+     * @param courseScheduleId 课程id
+     * @return boolean true:是  false :否
+     */
+    private boolean checkHasHomework(Long courseScheduleId) {
+        return this.lambdaQuery()
+                            .eq(CourseHomework::getCourseScheduleId, courseScheduleId)
+                            .eq(CourseHomework::getCourseGroupType, CourseScheduleEnum.PRACTICE.getCode())
+                            .count() >0;
+    }
+
+    @Override
+    public boolean reviewCourseHomework(CourseHomeworkReviewDto reviewDto) {
+        // 检查 老师 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
+        checkCourseSchedule(reviewDto.getCourseScheduleId());
+
+        // 检查已经布置了课后作业
+        if (!checkHasHomework(reviewDto.getCourseScheduleId())) {
+            throw new BizException("没布置作业，不能点评");
+        }
+
+        // 课程基本信息
+        CourseHomeworkDetailVo courseHomeworkDetailVo = baseMapper
+                .selectCourseHomeworkDetailByCourseId(reviewDto.getCourseScheduleId());
+
+        // 检查学生是否提交作业
+        if (!YesOrNoEnum.YES.getCode().equals(courseHomeworkDetailVo.getSubmitHomework().getCode())) {
+            throw  new BizException("学生未提交作业，不能点评");
+        }
+        studentCourseHomeworkService.reviewCourseHome(courseHomeworkDetailVo.getStudentHomeworkId(),reviewDto.getReview());
+    }
+
+    /**
+     * 检查课程能否布置作业
+     *
+     * @param courseScheduleId 课程id
+     */
+    private void checkCourseSchedule(Long courseScheduleId) {
+        // 1. 检查课程类型
+        CourseSchedule courseSchedule = courseScheduleService.getById(courseScheduleId);
+        if (!CourseScheduleEnum.PRACTICE.getCode().equals(courseSchedule.getType())) {
+            throw  new BizException("非陪练课，不能布置课后作业");
+        }
+        // 2. 检查课程结束
+        if (!CourseScheduleEnum.COMPLETE.getCode().equals(courseSchedule.getStatus())) {
+            throw  new BizException("课程未正常完成，不能布置课后作业");
+        }
+        // 3. 检查学生考勤
+        StudentAttendance studentAttendance = studentAttendanceService
+                .getByCourseTypeAndScheduleId(CourseScheduleEnum.PRACTICE, courseScheduleId);
+
+        if (studentAttendance == null) {
+            throw  new BizException("学生没有进行学习，不能布置课后作业");
+        }
+    }
+
+    /**
+     * 封装课程课后作业对象
+     *
+     * @param saveDto 课后作业信息
+     * @param courseSchedule 课程信息
+     * @return 课后作业对象
+     */
+    private CourseHomework getCourseHomework(CourseHomeworkSaveDto saveDto, CourseSchedule courseSchedule) {
+        CourseHomework courseHomework = new CourseHomework();
+        courseHomework.setCourseGroupId(courseSchedule.getCourseGroupId());
+        courseHomework.setCourseGroupType(CourseScheduleEnum.PRACTICE.getCode());
+        courseHomework.setCourseScheduleId(saveDto.getCourseScheduleId());
+        courseHomework.setTitle(saveDto.getTitle());
+        courseHomework.setContent(saveDto.getContent());
+        courseHomework.setAttachments(saveDto.getAttachments());
+        courseHomework.setExpectNum(1);
+        courseHomework.setCompletedNum(0);
+        courseHomework.setCreateTime(new Date());
+        return courseHomework;
+    }
+
 }

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

@@ -654,7 +654,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     @Override
     public Integer countTeacherNoDecorateHomework(HomeworkSearch homeworkSearch) {
 
-        // 陪练课 课程状态为完成，有学生考勤记录 没有学生课程记录
+        // 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
         return baseMapper.countTeacherNoDecorateHomework(homeworkSearch);
     }
 
@@ -675,5 +675,11 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     public IPage<MyCourseVo> queryStudentPracticeCourse(IPage<MyCourseVo> page, MyCourseSearch search) {
         return page.setRecords(baseMapper.queryStudentPracticeCourse(page, search));
     }
+
+    @Override
+    public boolean checkCourseSchedule(Long teacherId, Long courseId) {
+        CourseSchedule courseSchedule = this.getById(courseId);
+        return teacherId.equals(courseSchedule.getTeacherId());
+    }
 }
 

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

@@ -2,12 +2,16 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
 import com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
 import com.yonge.cooleshow.biz.dal.dao.StudentAttendanceDao;
 import com.yonge.cooleshow.biz.dal.service.StudentAttendanceService;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
 
 
 @Service
@@ -23,5 +27,17 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceD
     public IPage<StudentAttendanceVo> selectPage(IPage<StudentAttendanceVo> page, StudentAttendanceSearch query){
         return page.setRecords(baseMapper.selectPage(page, query));
     }
-	
+
+    @Override
+    public StudentAttendance getByCourseTypeAndScheduleId(CourseScheduleEnum courseType, Long courseScheduleId) {
+        List<StudentAttendance> list = this.lambdaQuery()
+                                           .eq(StudentAttendance::getCourseGroupType, courseType)
+                                           .eq(StudentAttendance::getCourseScheduleId, courseScheduleId)
+                                           .list();
+        if (!CollectionUtils.isEmpty(list)) {
+            return list.get(0);
+        }
+        return null;
+    }
+
 }

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

@@ -0,0 +1,259 @@
+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;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * Description 课后作业详情信息展示
+ *
+ * @author liujunchi
+ * @date 2022-04-14
+ */
+@ApiModel("课后作业详情信息展示")
+public class CourseHomeworkDetailVo {
+
+    @ApiModelProperty("课后作业主键ID ")
+    private Long id;
+
+    @ApiModelProperty("课程编号ID")
+    private Long courseScheduleId;
+
+    @ApiModelProperty("课程组id")
+    private Long courseGroupId;
+
+    @ApiModelProperty("学生课程作业id")
+    private Long studentHomeworkId;
+
+    @ApiModelProperty("课程类型 PRACTICE 陪练课 LIVE直播课")
+    private CourseScheduleEnum courseType;
+
+    @ApiModelProperty("上课日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private String classDate;
+
+    @ApiModelProperty("上课时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private String startTime;
+
+    @ApiModelProperty("下课时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private String endTime;
+
+    @ApiModelProperty("课程状态 NOT_START未开始 ING进行中 COMPLETE已完成 CANCEL已取消")
+    private CourseScheduleEnum courseStatus;
+
+    @ApiModelProperty("作业标题; ")
+    private String title;
+
+    @ApiModelProperty("作业内容 ")
+    private String content;
+
+    @ApiModelProperty("作业附件地址（多个用逗号分隔） ")
+    private String attachments;
+
+    @ApiModelProperty("学员提交的作品附件 ")
+    private String studentAttachments;
+
+    @ApiModelProperty("老师的作业点评 ")
+    private String teacherReplied;
+
+    @ApiModelProperty("作业提交时间 ")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date submitTime;
+
+    @ApiModelProperty("声部名称")
+    private String subjectName;
+
+    @ApiModelProperty("学员姓名")
+    private String studentName;
+
+    @ApiModelProperty("学员头像")
+    private String studentAvatar;
+
+    @ApiModelProperty("布置作业，0：未布置，1：已布置")
+    private YesOrNoEnum decorateHomework;
+
+    @ApiModelProperty("学生提交作业 0：未提交，1：已提交")
+    private YesOrNoEnum submitHomework;
+
+    @ApiModelProperty("点评作业 0：未点评，1：已点评")
+    private YesOrNoEnum reviewHomework;
+
+    public YesOrNoEnum getDecorateHomework() {
+        return decorateHomework;
+    }
+
+    public void setDecorateHomework(YesOrNoEnum decorateHomework) {
+        this.decorateHomework = decorateHomework;
+    }
+
+    public YesOrNoEnum getSubmitHomework() {
+        return submitHomework;
+    }
+
+    public void setSubmitHomework(YesOrNoEnum submitHomework) {
+        this.submitHomework = submitHomework;
+    }
+
+    public YesOrNoEnum getReviewHomework() {
+        return reviewHomework;
+    }
+
+    public void setReviewHomework(YesOrNoEnum reviewHomework) {
+        this.reviewHomework = reviewHomework;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    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 CourseScheduleEnum getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(CourseScheduleEnum courseType) {
+        this.courseType = courseType;
+    }
+
+    public String getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(String classDate) {
+        this.classDate = classDate;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public CourseScheduleEnum getCourseStatus() {
+        return courseStatus;
+    }
+
+    public void setCourseStatus(CourseScheduleEnum courseStatus) {
+        this.courseStatus = courseStatus;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    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 String getStudentAttachments() {
+        return studentAttachments;
+    }
+
+    public void setStudentAttachments(String studentAttachments) {
+        this.studentAttachments = studentAttachments;
+    }
+
+    public String getTeacherReplied() {
+        return teacherReplied;
+    }
+
+    public void setTeacherReplied(String teacherReplied) {
+        this.teacherReplied = teacherReplied;
+    }
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public Long getCourseGroupId() {
+        return courseGroupId;
+    }
+
+    public void setCourseGroupId(Long courseGroupId) {
+        this.courseGroupId = courseGroupId;
+    }
+
+    public Long getStudentHomeworkId() {
+        return studentHomeworkId;
+    }
+
+    public void setStudentHomeworkId(Long studentHomeworkId) {
+        this.studentHomeworkId = studentHomeworkId;
+    }
+}

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

@@ -42,4 +42,52 @@
         	<include refid="baseColumns" />
 		FROM course_homework t
 	</select>
+
+	<select id="selectCourseHomeworkDetailByCourseId"
+            resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo">
+        select  ch.id_ as id
+        ,ch.course_schedule_id_ as courseScheduleId
+        ,ch.title_ as title
+        ,ch.content_ as content
+        ,ch.attachments_ as attachments
+        ,sch.attachments_ as studentAttachments
+        ,sch.teacher_replied_ as teacherReplied
+        ,sch.submit_time_ as submitTime
+        ,sch.id_ as studentHomeworkId
+        ,cs.type_ as courseType
+        ,cs.class_date_ as classDate
+        ,cs.start_time_ as startTime
+        ,cs.end_time_ as endTime
+        ,cs.status_ as courseStatus
+        ,cs.course_group_id_ as courseGroupId
+        ,if(ch.id_ is null,0,1) as decorateHomework
+        ,if(sch.attachments_ is null or sch.attachments_ = '',0,1) as submitHomework
+        ,if(sch.teacher_replied_ is null or sch.attachments_ = '',0,1) as reviewHomework
+        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_
+        <where>
+            <if test="courseId != null">
+                ch.id_ = #{courseId}
+            </if>
+        </where>
+    </select>
+
+	<select id="selectPaymentStudentInfo" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo">
+        select su.username_ as studentName
+        ,su.avatar_ as stduentAvatar
+        ,s.name_ as subjectName
+        from course_group cg
+        left join subject s on cg.subject_id_ = s.id_
+        left join course_schedule_student_payment cssp on cg.id_ = cssp.course_group_id_
+        left join sys_user su on su.id_ = cssp.user_id_
+        <where>
+            <if test="courseGroupId != null">
+                and cg.id_ = #{courseGroupId}
+            </if>
+            <if test="courseScheduleId != null">
+                and cssp.course_id_ = #{courseScheduleId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -185,7 +185,8 @@
         left join student_attendance sa on cs.id_ = sa.course_schedule_id_
         left join course_homework ch on ch.course_schedule_id_ = sa.course_schedule_id_
         <where>
-            ch.id_ is null
+            <!-- 有考勤记录，没有布置作业记录 -->
+            ch.id_ is null and sa.id_ is not null
             <if test="param.courseStatus != null">
                 and cs.type_ = #{param.courseType}
             </if>
@@ -195,6 +196,9 @@
             <if test="param.teacherId != null">
                 and cs.teacher_id_ = #{param.teacherId}
             </if>
+            <if test="param.courseScheduleId != null ">
+                and cs.id_ = #{param.courseScheduleId}
+            </if>
         </where>
     </select>
 

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

@@ -2,17 +2,22 @@ package com.yonge.cooleshow.teacher.controller;
 
 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.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
+import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * Description 老师课后作业相关接口
@@ -31,6 +36,9 @@ public class CourseHomeworkController extends BaseController {
     @Autowired
     private CourseScheduleService courseScheduleService;
 
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+
     @ApiOperation(value = "未布置的课后作业数量")
     @GetMapping(value="/count")
     public HttpResponseResult<Integer> countTeacherNoDecorateHomework() {
@@ -46,4 +54,45 @@ public class CourseHomeworkController extends BaseController {
         return succeed(courseScheduleService.countTeacherNoDecorateHomework(homeworkSearch));
     }
 
+    @ApiOperation(value = "首页-我的课程-课程详情(陪练课)-课后作业信息详情",notes = "传入课程编号ID")
+    @GetMapping(value = "/detail/{courseId}", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<CourseHomeworkDetailVo> detail(@ApiParam(value = "课程编号ID", required = true)
+                                                                 @PathVariable("courseId") Long courseId) {
+
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        HttpResponseResult info = checkCourseSchedule(courseId,sysUser);
+        if (info != null) return info;
+        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId));
+    }
+
+    private HttpResponseResult checkCourseSchedule(Long courseId,SysUser sysUser) {
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!courseScheduleService.checkCourseSchedule(sysUser.getId(), courseId)) {
+            return failed("老师只能看自己的课程详情");
+        }
+        return null;
+    }
+
+    @ApiOperation(value = "陪练课-布置作业", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/decorate", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<Boolean> decorateCourseHomework(@Valid @RequestBody CourseHomeworkSaveDto saveDto) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        HttpResponseResult info = checkCourseSchedule(saveDto.getCourseScheduleId(),sysUser);
+        if (info != null) return info;
+        saveDto.setTeacherId(sysUser.getId());
+        return succeed(courseHomeworkService.decorateCourseHomework(saveDto));
+    }
+
+    @ApiOperation(value = "陪练课-作业点评", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/review", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<Boolean> reviewCourseHomework(@Valid @RequestBody CourseHomeworkReviewDto reviewDto) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        HttpResponseResult info = checkCourseSchedule(reviewDto.getCourseScheduleId(),sysUser);
+        if (info != null) return info;
+        reviewDto.setTeacherId(sysUser.getId());
+        return succeed(courseHomeworkService.reviewCourseHomework(reviewDto));
+    }
+
 }