update:琴房课后作业列表 作业状态

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

@@ -99,7 +99,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
                 .collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
 
         // 老师信息
-        List<CourseHomeworkVo> teacherInfoList = baseMapper.selectTeacherInfo(practiceRecordIdList);
+        List<CourseHomeworkVo> teacherInfoList = baseMapper.selectTeacherInfo(recordIdList);
         if (CollectionUtils.isEmpty(teacherInfoList)) {
             teacherInfoList = new ArrayList<>();
         }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.biz.dal.enums.HomeworkStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +29,17 @@ public class StudentHomeworkVo {
     @ApiModelProperty("声部 多个逗号隔开")
     private String subjectName;
 
+    @ApiModelProperty("NOTCOMMIT:未提交 ，NOTREVIEW: 未评价 REVIEWED:已评价")
+    private HomeworkStatusEnum homeworkStatus;
+
+    public HomeworkStatusEnum getHomeworkStatus() {
+        return homeworkStatus;
+    }
+
+    public void setHomeworkStatus(HomeworkStatusEnum homeworkStatus) {
+        this.homeworkStatus = homeworkStatus;
+    }
+
     public String getSubjectName() {
         return subjectName;
     }

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

@@ -160,10 +160,10 @@
             </if>
             <if test="param.homeworkStatus != null">
                 <choose>
-                    <when test="param.homeworkStatus  == 'NOTREVIEW'">
+                    <when test="param.homeworkStatus.code  == 'NOTREVIEW'">
                         and a.commitNum &gt; a.repliedNum
                     </when>
-                    <when test="param.homeworkStatus  == 'NOTCOMMIT'">
+                    <when test="param.homeworkStatus.code  == 'NOTCOMMIT'">
                         and a.studentNum &gt; a.commitNum
                     </when>
                     <otherwise>
@@ -338,6 +338,9 @@
         s.username_ as studentName,
         s.phone_ as studentAvatar,
         if(sch.id_ is not null,1,0) as submitHomework,
+        (case when sch.id_ is null then 'NOTCOMMIT'
+        when sch.teacher_replied_ is not null or sch.teacher_replied_ != '' then 'NOTREVIEW'
+        else 'REVIEWED' end ) as homeworkStatus,
         (select group_concat(s2.name_) from subject s2
         where find_in_set(s2.id_,st.subject_id_) and s2.del_flag_ = 0 ) as subjectName