Merge remote-tracking branch 'origin/master'

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/AdminFeignService.java

@@ -39,7 +39,7 @@ public interface AdminFeignService {
     /**
      * 老师作业布置通知
      */
-    @GetMapping("/task/teacherSend")
+    @PostMapping("/task/teacherSend")
     HttpResponseResult<Object> sendTodayNotRepliedAndNotDecorateHomework();
 
     //老师课酬

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

@@ -122,7 +122,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         }
 
 
-        // 声部信息 群组信息
+        // 声部信息 群组 课程信息
         List<CourseHomeworkVo> subjectList = baseMapper.selectSubjectAndGroupInfoList(recordIdList);
 
         if (CollectionUtils.isEmpty(subjectList)) {

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

@@ -194,7 +194,7 @@
         ,sch.attachments_ as studentAttachments
         ,sch.teacher_replied_ as teacherReplied
         ,cg.id_ as courseGroupId
-        ,cg.name_ as courseGroupName
+        ,concat(cg.name_,'-第',cs.class_num_,'课') as courseGroupName
         ,cs.class_num_ as classNum
         ,sch.submit_time_ as submitTime
         ,sch.id_ as studentHomeworkId
@@ -282,7 +282,7 @@
         select
         cs.id_ as courseId,
         s.name_ as subjectName
-        ,cg.name_ as courseGroupName
+        ,concat(cg.name_,'-第',cs.class_num_,'课') as courseGroupName
         ,cg.background_pic_ as backgroundPic
         ,cs.class_num_ as classNum
         ,ig.id_ as imGroupId

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

@@ -343,6 +343,7 @@
         LEFT JOIN im_group i ON g.id_ = i.course_group_id_
         WHERE cs.lock_=0
         AND cs.status_ IN ('ING','COMPLETE','NOT_START')
+        AND g.status_ IN ('ING', 'COMPLETE')
         AND cs.type_ IN ('LIVE','PIANO_ROOM_CLASS')
         AND cs.teacher_id_=#{param.teacherId}
         AND cs.class_date_=#{param.classDate}
@@ -508,6 +509,7 @@
         LEFT JOIN (SELECT course_id_,COUNT(1) AS payCount FROM course_schedule_student_payment GROUP BY course_id_) a ON s.id_=a.course_id_
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
+        AND g.status_ IN ('ING', 'COMPLETE')
         AND s.id_ IN
         (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ IN ('LIVE','PIANO_ROOM_CLASS'))
         AND s.class_date_ = #{param.classDate}