web vip课评价列表增加是否到课

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -429,4 +429,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param groupName
      */
     void updateGroupName(Integer groupId, String groupName);
+
+    /**
+     * @params @param courseId:课程编号
+     * @return com.ym.mec.biz.dal.dto.TeacherClassHeadInfo
+     * @describe 获取班级信息
+     */
+    TeacherClassHeadInfo findTeacherClassGroupInfoByCourseId(Integer courseId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -2932,6 +2932,50 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupDao.updateGroupName(groupId, groupName);
     }
 
+    @Override
+    public TeacherClassHeadInfo findTeacherClassGroupInfoByCourseId(Integer courseId) {
+        CourseSchedule courseSchedule = courseScheduleDao.get(courseId.longValue());
+        Integer classGroupId = courseSchedule.getClassGroupId();
+
+        ClassGroup classGroup = classGroupDao.get(classGroupId.intValue());
+
+        if (Objects.isNull(classGroup)) {
+            throw new BizException("未找到该班级");
+        }
+
+        String subjectNames = subjectDao.findNames(classGroup.getSubjectIdList());
+
+        TeacherClassHeadInfo teacherClassHeadInfo = new TeacherClassHeadInfo();
+        teacherClassHeadInfo.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
+        teacherClassHeadInfo.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(classGroup.getId(), new Date()));
+        teacherClassHeadInfo.setTotalClassTimes(courseScheduleDao.countClassGroupCourses(classGroup.getId()));
+        if (subjectNames != null && !subjectNames.isEmpty()) {
+            teacherClassHeadInfo.setSubjectNames(subjectNames);
+        }
+        ClassGroupTeacherMapper bishopTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(classGroupId, TeachTypeEnum.BISHOP);
+        if (Objects.nonNull(bishopTeacher)) {
+            teacherClassHeadInfo.setBishopTeacherId(bishopTeacher.getId());
+            teacherClassHeadInfo.setBishopTeacher(bishopTeacher.getUserName());
+        }
+
+        String name = classGroupTeacherMapperDao.queryTeachingNames(classGroupId);
+        teacherClassHeadInfo.setTeachingTeacher(name);
+
+        if (classGroup.getType() == ClassGroupTypeEnum.VIP) {
+            String[] studentNums = classGroupStudentMapperDao.findCourseStudentName(courseId);
+            teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
+        }
+        if (classGroup.getType() == ClassGroupTypeEnum.PRACTICE) {
+            String[] studentNums = classGroupStudentMapperDao.findCourseStudentName(courseId);
+            teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
+        }
+        if (classGroup.getType() == ClassGroupTypeEnum.COMM) {
+            String[] studentNums = classGroupStudentMapperDao.findCourseStudentName(courseId);
+            teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
+        }
+        return teacherClassHeadInfo;
+    }
+
 
     @Override
     public ClassGroup findGroupById(Integer groupId) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -303,7 +303,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
     public TeacherClassHeadInfo getCourseInfoHead(Integer id) {
         CourseSchedule courseSchedule = courseScheduleDao.get(id.longValue());
         ClassGroup classGroup = classGroupService.get(courseSchedule.getClassGroupId());
-        TeacherClassHeadInfo teacherClassGroupInfo = classGroupService.findTeacherClassGroupInfo(courseSchedule.getClassGroupId());
+        TeacherClassHeadInfo teacherClassGroupInfo = classGroupService.findTeacherClassGroupInfoByCourseId(id);
         teacherClassGroupInfo.setClassDate(DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日"));
         teacherClassGroupInfo.setStartClassTime(DateUtil.dateToString(courseSchedule.getStartClassTime(), "HH:mm"));
         teacherClassGroupInfo.setEndClassTime(DateUtil.dateToString(courseSchedule.getEndClassTime(), "HH:mm"));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -34,6 +34,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 
 @Service
 public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, StudentCourseHomework> implements StudentCourseHomeworkService {
@@ -126,7 +127,12 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
 //        CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
 //        if (temp.getExpectNum().equals(courseHomework.getCompletedNum())) {
-        CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(), bean.getUserId());
+        Integer userId = bean.getUserId();
+        if(courseSchedule.getType().equals(CourseScheduleType.VIP)){
+            userId = null;
+        }
+
+        CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(), userId);
         if (Objects.nonNull(review)) {
             review.setHandHomework(YesOrNoEnum.YES.getCode());
             courseScheduleReviewDao.update(review);