小组课

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/CourseHomeworkController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSubmitDto;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
-import com.yonge.cooleshow.biz.dal.entity.TeacherAttendance;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
@@ -23,8 +22,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Description 学生课后作业相关接口
@@ -92,17 +91,10 @@ public class CourseHomeworkController extends BaseController {
     @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) {
-        Long userId = sysUserService.getUserId();
         query.setDecorate(YesOrNoEnum.YES);
-        query.setStudentId(userId);
+        query.setStudentId(sysUserService.getUserId());
         query.setClientType("STUDENT");
         query.setCourseStatus(CourseScheduleEnum.COMPLETE);
-        List<CourseScheduleEnum> list = new ArrayList<>();
-        list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
-        list.add(CourseScheduleEnum.PRACTICE);
-        list.add(CourseScheduleEnum.VIP);
-        list.add(CourseScheduleEnum.GROUP);
-        query.setCourseType(list);
 
         IPage<CourseHomeworkVo> page = courseHomeworkService.selectPage(PageUtil.getPage(query), query);
         List<CourseHomeworkVo> records = page.getRecords();

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

@@ -62,6 +62,8 @@ public class CourseHomeworkController extends BaseController {
         List<CourseScheduleEnum> list = new ArrayList<>();
         list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
         list.add(CourseScheduleEnum.PRACTICE);
+        list.add(CourseScheduleEnum.VIP);
+        list.add(CourseScheduleEnum.GROUP);
         homeworkSearch.setCourseType(list);
         homeworkSearch.setDecorate(YesOrNoEnum.NO);
         Integer integer = courseScheduleService.countTeacherNoDecorateHomework(homeworkSearch);
@@ -139,12 +141,6 @@ public class CourseHomeworkController extends BaseController {
     public HttpResponseResult<PageInfo<CourseHomeworkVo>> list(@Valid @RequestBody HomeworkSearch query) {
         query.setTeacherId(sysUserService.getUserId());
         query.setCourseStatus(CourseScheduleEnum.COMPLETE);
-        List<CourseScheduleEnum> list = new ArrayList<>();
-        list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
-        list.add(CourseScheduleEnum.PRACTICE);
-        list.add(CourseScheduleEnum.VIP);
-        list.add(CourseScheduleEnum.GROUP);
-        query.setCourseType(list);
         query.setClientType("TEACHER");
 
         IPage<CourseHomeworkVo> page = courseHomeworkService.selectPage(PageUtil.getPage(query), query);

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

@@ -1504,6 +1504,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         if(StringUtils.equals("GROUP",schedule.getType())){
             //更新开课时间
             courseGroupService.getDao().updateCourseStartTime(schedule.getCourseGroupId());
+            //更新课程课次
+            List<CourseSchedule> courseSchedules = this.lambdaQuery().eq(CourseSchedule::getCourseGroupId, schedule.getCourseGroupId()).list();
+            courseSchedules.forEach(courseSchedule1 -> {
+                courseSchedule1.setClassNum(courseSchedules.indexOf(courseSchedule1)+1);
+            });
+            this.updateBatchById(courseSchedules);
         }
         // 课程调整后给学生发消息
         sendCourseAdjustMessage(teacherId,studentIds,adjustVo.getCourseId(),adjustVo.getStartTime(),oldStartTime);

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

@@ -292,6 +292,7 @@
                 </foreach>
             </if>
         </where>
+        order by cssp.id_ DESC
     </select>
 
 	<select id="selectSubjectAndGroupInfoList" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">