Browse Source

fix:琴房课后作业列表加琴房状态

liujunchi 2 years ago
parent
commit
a0d0eaf454

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

@@ -36,6 +36,9 @@ public class CourseScheduleHomeworkVo {
     private Integer classNum;
 
 
+    @ApiModelProperty("课程状态 NOT_START未开始 ING进行中 COMPLETE已完成 CANCEL已取消")
+    private CourseScheduleEnum courseStatus;
+
     @ApiModelProperty("上课日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@@ -75,6 +78,13 @@ public class CourseScheduleHomeworkVo {
     @ApiModelProperty("学生课后作业列表")
     private IPage<StudentHomeworkVo> studentHomeworkList;
 
+    public CourseScheduleEnum getCourseStatus() {
+        return courseStatus;
+    }
+
+    public void setCourseStatus(CourseScheduleEnum courseStatus) {
+        this.courseStatus = courseStatus;
+    }
 
     public Long getCourseId() {
         return courseId;

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

@@ -296,6 +296,7 @@
             ch.attachments_ as attachments,
         if(ch.id_ is null,0,1) as decorateHomework,
         ch.create_time_ as decorateTime,
+        cs.status_ as courseStatus,
         cg.background_pic_ as backgroundPic
         from course_schedule  cs
         left join course_group cg on cs.course_group_id_ = cg.id_