add:老师端课后作业

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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.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.dto.search.CourseHomeworkSearch;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
@@ -28,7 +28,7 @@ public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	 * @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);
+	List<CourseHomeworkVo> selectPage(@Param("page") IPage<CourseHomeworkVo> page, @Param("param") HomeworkSearch query);
 
 	/**
 	 * 课程详情 课后作业信息
@@ -45,6 +45,8 @@ public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	 * @param courseScheduleId 课程id
 	 * @return 购买用户信息
 	 */
-	CourseHomeworkDetailVo selectPaymentStudentInfo(@Param("courseGroupId") Long courseGroupId,
-													@Param("courseScheduleId") Long courseScheduleId);
+	CourseHomeworkDetailVo selectPaymentStudentInfo(@Param("courseGroupId") Long courseGroupId, @Param(
+			"courseScheduleId") Long courseScheduleId);
+
+	List<CourseHomeworkVo> selectStudentInfo(@Param("records") List<CourseHomeworkVo> records);
 }

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

@@ -3,6 +3,9 @@ package com.yonge.cooleshow.biz.dal.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * Description 老师作业点评
  *
@@ -13,9 +16,11 @@ import io.swagger.annotations.ApiModelProperty;
 public class CourseHomeworkReviewDto {
 
     @ApiModelProperty(value = "课程ID",required = true)
+    @NotNull(message = "课程ID不能为空 ")
     private Long courseScheduleId;
 
     @ApiModelProperty(value = "点评信息",required = true)
+    @NotBlank(message = "点评信息不能为空")
     private String review;
 
     @ApiModelProperty("老师id")

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

@@ -1,6 +1,5 @@
 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;
 
@@ -16,16 +15,19 @@ import javax.validation.constraints.NotNull;
 @ApiModel("布置作业信息")
 public class CourseHomeworkSaveDto {
 
+    @ApiModelProperty(value = "课后作业id",hidden = true)
+    private Long courseHomeworkId;
+
     @ApiModelProperty(value = "课程编号",required = true)
-    @NotNull(message = "课程编号不能为空")
+    @NotNull(message = "课程编号不能为空 ")
     private Long courseScheduleId;
 
     @ApiModelProperty(value = "作业标题",required = true)
-    @NotBlank(message = "作业标题不能为空")
+    @NotBlank(message = "作业标题不能为空 ")
     private String title;
 
     @ApiModelProperty(value = "作业内容",required = true)
-    @NotBlank(message = "作业内容不能为空")
+    @NotBlank(message = "作业内容不能为空 ")
     private String content;
 
     @ApiModelProperty("作业附件地址（多个用逗号分隔）")
@@ -73,4 +75,12 @@ public class CourseHomeworkSaveDto {
     public void setTeacherId(Long teacherId) {
         this.teacherId = teacherId;
     }
+
+    public Long getCourseHomeworkId() {
+        return courseHomeworkId;
+    }
+
+    public void setCourseHomeworkId(Long courseHomeworkId) {
+        this.courseHomeworkId = courseHomeworkId;
+    }
 }

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

@@ -24,7 +24,7 @@ public class HomeworkSearch extends QueryInfo {
     @ApiModelProperty(value = "课程状态： NOT_START:未开始； ING:进行中； COMPLETE:已完成； CANCEL:已取消",hidden = true)
     private CourseScheduleEnum courseStatus;
 
-    @ApiModelProperty("布置作业 0:否，1:是")
+    @ApiModelProperty("布置作业状态 0:否，1:是")
     private YesOrNoEnum decorate;
 
     @ApiModelProperty(value = "课程编号ID",hidden = true)

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
 
 import java.util.Arrays;
 import java.util.List;
@@ -9,7 +10,7 @@ import java.util.stream.Collectors;
 /**
  * 课程类型
  */
-public enum CourseScheduleEnum {
+public enum CourseScheduleEnum implements BaseEnum<String,CourseScheduleEnum> {
     //课程类型
     PRACTICE("PRACTICE", "陪练课"),
     LIVE("LIVE", "直播课"),

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

@@ -4,10 +4,10 @@ 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.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.dto.search.CourseHomeworkSearch;
-import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 
 /**
  * 课程作业表 服务类
@@ -25,10 +25,8 @@ public interface CourseHomeworkService extends IService<CourseHomework>  {
 
     /**
      * 分页查询
-     * @author liweifan
- 	 * @date 2022-03-30
      */
-    IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, CourseHomeworkSearch query);
+    IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, HomeworkSearch query);
 
 	/**
 	 * 课程详情 课后作业信息

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

@@ -7,7 +7,6 @@ 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;

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

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.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.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;
@@ -21,8 +20,11 @@ import com.yonge.cooleshow.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
+import java.util.List;
 
 
 @Service
@@ -44,9 +46,18 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         return detail;
     }
     
-     @Override
-    public IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, CourseHomeworkSearch query){
-        return page.setRecords(baseMapper.selectPage(page, query));
+    @Override
+    public IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, HomeworkSearch query){
+        IPage<CourseHomeworkVo> courseHomeworkVoIPage = page.setRecords(baseMapper.selectPage(page, query));
+        List<CourseHomeworkVo> records = courseHomeworkVoIPage.getRecords();
+        List<CourseHomeworkVo> userInfoList = baseMapper.selectStudentInfo(records);
+        for (int i = 0; i < records.size(); i++) {
+            CourseHomeworkVo userInfo = userInfoList.get(i);
+            records.get(i).setStudentAvatar(userInfo.getStudentAvatar());
+            records.get(i).setStudentName(userInfo.getStudentName());
+            records.get(i).setSubjectName(userInfo.getSubjectName());
+        }
+        return courseHomeworkVoIPage;
     }
 
     @Override
@@ -67,42 +78,49 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean decorateCourseHomework(CourseHomeworkSaveDto saveDto) {
         // 检查 老师 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
         checkCourseSchedule(saveDto.getCourseScheduleId());
 
         // 检查已经布置了课后作业
-        if (checkHasHomework(saveDto.getCourseScheduleId())) {
-            throw  new BizException("已布置作业");
+        CourseHomework homework = checkHasHomework(saveDto.getCourseScheduleId());
+        if (homework != null) {
+            saveDto.setCourseHomeworkId(homework.getId());
         }
 
         CourseSchedule courseSchedule = courseScheduleService.getById(saveDto.getCourseScheduleId());
         // 创建课后作业
         CourseHomework courseHomework = getCourseHomework(saveDto, courseSchedule);
 
-        return this.save(courseHomework);
+        return this.saveOrUpdate(courseHomework);
     }
 
     /**
-     * 检查课程是否已经布置作业
+     * 获取课程作业
      *
      * @param courseScheduleId 课程id
-     * @return boolean true:是  false :否
+     * @return CourseHomework
      */
-    private boolean checkHasHomework(Long courseScheduleId) {
-        return this.lambdaQuery()
-                            .eq(CourseHomework::getCourseScheduleId, courseScheduleId)
-                            .eq(CourseHomework::getCourseGroupType, CourseScheduleEnum.PRACTICE.getCode())
-                            .count() >0;
+    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;
+        }
+        return list.get(0);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean reviewCourseHomework(CourseHomeworkReviewDto reviewDto) {
         // 检查 老师 陪练课 课程状态为完成，有学生考勤记录 没有布置作业
         checkCourseSchedule(reviewDto.getCourseScheduleId());
 
         // 检查已经布置了课后作业
-        if (!checkHasHomework(reviewDto.getCourseScheduleId())) {
+        if (checkHasHomework(reviewDto.getCourseScheduleId()) == null) {
             throw new BizException("没布置作业，不能点评");
         }
 
@@ -132,13 +150,6 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         if (!CourseScheduleEnum.COMPLETE.getCode().equals(courseSchedule.getStatus())) {
             throw  new BizException("课程未正常完成，不能布置课后作业");
         }
-        // 3. 检查学生考勤
-        StudentAttendance studentAttendance = studentAttendanceService
-                .getByCourseTypeAndScheduleId(CourseScheduleEnum.PRACTICE, courseScheduleId);
-
-        if (studentAttendance == null) {
-            throw  new BizException("学生没有进行学习，不能布置课后作业");
-        }
     }
 
     /**
@@ -150,6 +161,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
      */
     private CourseHomework getCourseHomework(CourseHomeworkSaveDto saveDto, CourseSchedule courseSchedule) {
         CourseHomework courseHomework = new CourseHomework();
+        courseHomework.setId(saveDto.getCourseHomeworkId());
         courseHomework.setCourseGroupId(courseSchedule.getCourseGroupId());
         courseHomework.setCourseGroupType(CourseScheduleEnum.PRACTICE.getCode());
         courseHomework.setCourseScheduleId(saveDto.getCourseScheduleId());

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

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description 数量
+ *
+ * @author liujunchi
+ * @date 2022-04-15
+ */
+public class CountVo {
+
+    @ApiModelProperty("数量")
+    private Integer count;
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+}

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

@@ -1,14 +1,111 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Author: liweifan
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "CourseHomeworkVo对象", description = "课程作业表查询视图对象")
-public class CourseHomeworkVo extends CourseHomework{
+public class CourseHomeworkVo{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("课程编号ID")
+	private Long courseId;
+
+
+	@ApiModelProperty("课程组ID")
+	private Long courseGroupId;
+
+
+	@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("声部名称")
+	private String subjectName;
+
+	@ApiModelProperty("学员姓名")
+	private String studentName;
+
+	@ApiModelProperty("学员头像")
+	private String studentAvatar;
+
+	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 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 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;
+	}
 }

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

@@ -13,8 +13,8 @@
 	        <result column="completed_num_" property="completedNum" />
 	        <result column="create_time_" property="createTime" />
 	        <result column="update_time_" property="updateTime" />
-		</resultMap>  
-    
+		</resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
          t.id_
@@ -28,25 +28,52 @@
         , t.completed_num_
         , t.create_time_
         , t.update_time_
-        </sql> 
-    
+        </sql>
+
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
         SELECT
             <include refid="baseColumns"/>
         FROM course_homework t
         where t.id_ = #{id}
     </select>
-    
-    <select id="selectPage" resultMap="BaseResultMap">
-		SELECT         
-        	<include refid="baseColumns" />
-		FROM course_homework t
+
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
+        select
+        cs.id_ AS courseId,
+        cs.course_group_id_ AS courseGoupId,
+        cs.class_date_ AS classDate,
+        cs.start_time_ AS startTime,
+        cs.end_time_ AS endTime
+        from course_schedule cs
+        left join course_homework ch on ch.course_schedule_id_ = cs.id_
+        <where>
+            <if test="param.decorate != null">
+                <if test="param.decorate.code == 0">
+                    and ch.id_ is null
+                </if>
+                <if test="param.decorate.code == 1">
+                    and ch.id_ is not null
+                </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.teacherId != null">
+                and cs.teacher_id_ = #{param.teacherId}
+            </if>
+            <if test="param.courseScheduleId != null ">
+                and cs.id_ = #{param.courseScheduleId}
+            </if>
+        </where>
 	</select>
 
 	<select id="selectCourseHomeworkDetailByCourseId"
             resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo">
         select  ch.id_ as id
-        ,ch.course_schedule_id_ as courseScheduleId
+        ,cs.id_ as courseScheduleId
         ,ch.title_ as title
         ,ch.content_ as content
         ,ch.attachments_ as attachments
@@ -68,7 +95,7 @@
         left join student_course_homework sch on ch.id_ = sch.course_homework_id_
         <where>
             <if test="courseId != null">
-                ch.id_ = #{courseId}
+                cs.id_ = #{courseId}
             </if>
         </where>
     </select>
@@ -90,4 +117,29 @@
             </if>
         </where>
     </select>
+
+	<select id="selectStudentInfo" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
+        select
+        s.name_ as subjectName
+        ,su.username_ as studentName
+        ,su.avatar_ as studentAvatar
+        from course_schedule_student_payment cssp
+        left join course_group cg on cssp.course_group_id_ = cg.id_
+        left join subject s on s.id_ = cg.subject_id_
+        left join sys_user su on cssp.user_id_ = su.id_
+        <where>
+            <if test="records != null and records.size() != 0">
+                and cssp.course_id_ in
+                <foreach collection="records" separator="," close=")" open="(" item="item" >
+                    #{item.courseId}
+                </foreach>
+            </if>
+        </where>
+        <if test="records != null and records.size() != 0">
+            order by field(cssp.course_id_,
+            <foreach collection="records" separator="," close=")" open="" item="item" >
+                #{item.courseId}
+            </foreach>
+        </if>
+    </select>
 </mapper>

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

@@ -182,11 +182,17 @@
 
         select count(1)
         from course_schedule cs
-        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_
+        left join course_homework ch on ch.course_schedule_id_ = cs.id_
         <where>
-            <!-- 有考勤记录，没有布置作业记录 -->
-            ch.id_ is null and sa.id_ is not null
+            <!-- 没有布置作业记录 -->
+            <if test="param.decorate != null">
+                <if test="param.decorate.code == 0">
+                    and ch.id_ is null
+                </if>
+                <if test="param.decorate.code == 1">
+                    and ch.id_ is not null
+                </if>
+            </if>
             <if test="param.courseStatus != null">
                 and cs.type_ = #{param.courseType}
             </if>
@@ -224,13 +230,11 @@
             u.username_ AS userName,
             u.avatar_ AS avatar,
             g.subject_id_ AS subjectId,
-            b.name_ AS subjectName,
-            a.sign_in_time_ AS signInTime
+            b.name_ AS subjectName
         FROM course_schedule s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` b ON g.subject_id_ = b.id_
-        LEFT JOIN student_attendance a ON s.id_ = a.course_schedule_id_
         WHERE s.id_ IN
         (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ = 'PRACTICE')
         <if test="param.status !=null and param.status !=''">

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

@@ -6,11 +6,16 @@ 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.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+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.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -41,7 +46,7 @@ public class CourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "未布置的课后作业数量")
     @GetMapping(value="/count")
-    public HttpResponseResult<Integer> countTeacherNoDecorateHomework() {
+    public HttpResponseResult<CountVo> countTeacherNoDecorateHomework() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
@@ -51,11 +56,15 @@ public class CourseHomeworkController extends BaseController {
         homeworkSearch.setTeacherId(sysUser.getId());
         homeworkSearch.setCourseStatus(CourseScheduleEnum.COMPLETE);
         homeworkSearch.setCourseType(CourseScheduleEnum.PRACTICE);
-        return succeed(courseScheduleService.countTeacherNoDecorateHomework(homeworkSearch));
+        homeworkSearch.setDecorate(YesOrNoEnum.NO);
+        Integer integer = courseScheduleService.countTeacherNoDecorateHomework(homeworkSearch);
+        CountVo countVo = new CountVo();
+        countVo.setCount(integer);
+        return succeed(countVo);
     }
 
     @ApiOperation(value = "首页-我的课程-课程详情(陪练课)-课后作业信息详情",notes = "传入课程编号ID")
-    @GetMapping(value = "/detail/{courseId}", consumes = "application/json", produces = "application/json")
+    @GetMapping(value = "/detail/{courseId}")
     public HttpResponseResult<CourseHomeworkDetailVo> detail(@ApiParam(value = "课程编号ID", required = true)
                                                                  @PathVariable("courseId") Long courseId) {
 
@@ -95,4 +104,18 @@ public class CourseHomeworkController extends BaseController {
         return succeed(courseHomeworkService.reviewCourseHomework(reviewDto));
     }
 
+    @ApiOperation(value = "课后作业-列表", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/list", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<PageInfo<CourseHomeworkVo>> list(@Valid @RequestBody HomeworkSearch query) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (query.getDecorate() == null) {
+            return failed("布置状态不能为空");
+        }
+        query.setTeacherId(sysUser.getId());
+        query.setCourseStatus(CourseScheduleEnum.COMPLETE);
+        query.setCourseType(CourseScheduleEnum.PRACTICE);
+        return succeed(PageUtil.pageInfo(courseHomeworkService.selectPage(PageUtil.getPage(query),query)));
+    }
+
+
 }