Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -55,10 +55,6 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		if (userInfo == null) {
 			userInfo = sysUserService.initUser(principal,clientId,isRegister,isLessee);
 		}
-	
-//		if (userInfo.getSysUser().getUserType() != SysUserType.SYSTEM && !StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {
-//			throw new LockedException("用户不存在,请联系教务老师");
-//		}
 		if("EDUCATION".equals(clientId)){
 			clientId = "SYSTEM";
 		}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -57,20 +57,17 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	public SysUser queryByPhone(String phone) {
-		SysUser sysUser = sysUserDao.queryByPhone(phone);
-		return sysUser;
+		return sysUserDao.queryByPhone(phone);
 	}
 
 	@Override
 	public SysUserInfo queryUserInfoByUsername(String username) {
-		SysUser sysUser = queryByUsername(username);
-		return getSysUserInfo(sysUser);
+		return getSysUserInfo(queryByUsername(username));
 	}
 
 	@Override
 	public SysUserInfo queryUserInfoByPhone(String phone) {
-		SysUser sysUser = queryByPhone(phone);
-		return getSysUserInfo(sysUser);
+		return getSysUserInfo(queryByPhone(phone));
 	}
 
 	private SysUserInfo getSysUserInfo(SysUser sysUser) {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -94,14 +94,17 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "设置密码")
 	@PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
-			@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
+	@ApiImplicitParams({@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "username", value = "用户名", required = true, dataType = "String") })
-	public Object setPassword(String mobile, String password, String username) {
-		if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(password)) {
-			return failed();
+	public Object setPassword(String password, String username) {
+		if (StringUtils.isEmpty(password)) {
+			return failed("参数校验失败");
 		}
-		SysUser sysUser = sysUserService.queryByPhone(mobile);
+		AuthUser authUser = SecurityUtils.getUser();
+		if (authUser == null) {
+			return failed("获取用户信息失败");
+		}
+		SysUser sysUser = sysUserService.get(authUser.getUserId());
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}
@@ -126,7 +129,11 @@ public class UserController extends BaseController {
 		if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(newPassword)) {
 			return failed("参数校验异常");
 		}
-		SysUser sysUser = sysUserService.queryByPhone(mobile);
+		AuthUser authUser = SecurityUtils.getUser();
+		if (authUser == null) {
+			return failed("获取用户信息失败");
+		}
+		SysUser sysUser = sysUserService.get(authUser.getUserId());
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -175,11 +175,11 @@
     </select>
 
     <select id="queryByUsername" resultMap="SysUser">
-		select * from sys_user where username_ = #{username} OR phone_ = #{username} LIMIT 1
+		select * from sys_user where username_ = #{username} OR phone_ = #{username} LIMIT 1 FOR UPDATE
 	</select>
 
     <select id="queryByPhone" resultMap="SysUser">
-		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1
+		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
 	</select>
     <resultMap id="ImUserModel" type="com.ym.mec.common.entity.ImUserModel">
         <result column="id_" property="id"/>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.CoursesGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -125,6 +126,15 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ImGroupModel> queryUserVipGroups(@Param("userId") Integer userId, @Param("search") String search);
 
     /**
+     * 获取学员所在对外群组信息
+     *
+     * @param userId
+     * @param search
+     * @return
+     */
+    List<ImGroupModel> queryUserCommGroups(@Param("userId") Integer userId, @Param("search") String search);
+
+    /**
      * 获取vip课的学生名称列表
      *
      * @param vipIds

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleReviewDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.CourseReviewDto;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -38,4 +39,15 @@ public interface CourseScheduleReviewDao extends BaseDAO<Integer, CourseSchedule
      * @return
      */
     Integer countPracticeGroupReviews4Edu(Map<String, Object> params);
-}
+
+    /**
+     * @describe 根据学生和课程获取评论
+     * @author Joburgess
+     * @date 2020/3/13
+     * @param courseScheduleId:
+     * @param studentId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleReview>
+     */
+    CourseScheduleReview findByCourseScheduleAndStudent(@Param("courseScheduleId") Long courseScheduleId,
+                                                    @Param("studentId") Integer studentId);
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -392,6 +392,25 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<BasicUserDto> findCloseCourseStudentIds(@Param("teacherId") Integer teacherId,@Param("search") String search);
 
     /**
+     * 获取相关vip教务的学员编号
+     * @param teacherId
+     * @return
+     */
+    List<BasicUserDto> findVipEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
+    /**
+     * 获取相关vip教务的学员编号
+     * @param teacherId
+     * @return
+     */
+    List<BasicUserDto> findCommEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
+    /**
+     * 获取相关陪练教务的学员编号
+     * @param teacherId
+     * @return
+     */
+    List<BasicUserDto> findPracticeEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
+
+    /**
      * 获取学员相关的陪练课教务老师
      * @param userId
      * @return
@@ -404,4 +423,11 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return
      */
     Set<Integer> findVipEducationalTeacherId(Integer studentId);
+
+    /**
+     * 获取学员相关的对外课教务老师
+     * @param studentId
+     * @return
+     */
+    Set<Integer> findCommEducationalTeacherId(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CoursesGroup.java

@@ -51,7 +51,10 @@ public class CoursesGroup {
 
 	/** 已冻结课时数 */
 	private Integer freezeMinutes;
-	
+
+	/** 教务老师 */
+	private Integer educationalTeacherId;
+
 	/** 报名结束时间 */
 	private java.util.Date applyClosingDate;
 	
@@ -73,6 +76,14 @@ public class CoursesGroup {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getEducationalTeacherId() {
+		return educationalTeacherId;
+	}
+
+	public void setEducationalTeacherId(Integer educationalTeacherId) {
+		this.educationalTeacherId = educationalTeacherId;
+	}
+
 	public Integer getConsumeMinutes() {
 		return consumeMinutes;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageAttendanceQueryInfo.java

@@ -24,9 +24,20 @@ public class StudentManageAttendanceQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "老师名称",required = false)
     private String teacherName;
 
+    @ApiModelProperty(value = "课程状态",required = false)
+    private String courseStatus;
+
     @ApiModelProperty(value = "状态（正常、旷课、请假、休学）",required = false)
     private StudentAttendanceStatusEnum attendanceStatus;
 
+    public String getCourseStatus() {
+        return courseStatus;
+    }
+
+    public void setCourseStatus(String courseStatus) {
+        this.courseStatus = courseStatus;
+    }
+
     public Integer getStudentId() {
         return studentId;
     }

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

@@ -38,6 +38,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ym.mec.biz.dal.enums.GroupType.*;
+
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> implements ClassGroupService {
 
@@ -52,6 +54,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupDao musicGroupDao;
     @Autowired
+    private PracticeGroupDao practiceGroupDao;
+    @Autowired
+    private CoursesGroupDao coursesGroupDao;
+    @Autowired
     private MusicGroupBuildLogDao musicGroupBuildLogDao;
     @Autowired
     private ClassGroupRelationService classGroupRelationService;
@@ -599,8 +605,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取学员的乐团列表详情
         List<CourseListDto> musicCourse = classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","), userId);
 
-        if(!CollectionUtils.isEmpty(typeGroupMap.get(GroupType.PRACTICE))){
-            musicGroupIds=typeGroupMap.get(GroupType.PRACTICE).stream().map(Group::getId).collect(Collectors.toList());
+        if(!CollectionUtils.isEmpty(typeGroupMap.get(PRACTICE))){
+            musicGroupIds=typeGroupMap.get(PRACTICE).stream().map(Group::getId).collect(Collectors.toList());
         }else{
             musicGroupIds=null;
         }
@@ -706,6 +712,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public List<ImGroupModel> queryUserGroups(Integer userId, String search) {
         List<ImGroupModel> imGroupModels = classGroupDao.queryUserMusicGroups(userId, search);
         imGroupModels.addAll(classGroupDao.queryUserVipGroups(userId, search));
+        imGroupModels.addAll(classGroupDao.queryUserCommGroups(userId, search));
         if (imGroupModels != null && imGroupModels.size() > 0) {
 //            Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
@@ -725,6 +732,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (students == null) {
             students = new ArrayList<>();
         }
+        ClassGroup classGroup = classGroupDao.get(groupId);
+        GroupType groupType = classGroup.getGroupType();
+        String musicGroupId = classGroup.getMusicGroupId();
         //获取当前群关联的乐团
         MusicGroup musicGroup = musicGroupDao.findByClassId(groupId);
         Set<Integer> teacherIds = new HashSet<>();
@@ -735,10 +745,28 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         //获取相关老师
         teacherIds.addAll(classGroupDao.findGroupTeacher(groupId));
-
+        //获取网管课课程教务老师
+        PracticeGroup practiceGroup = null;
+        VipGroup vipGroup = null;
+        CoursesGroup coursesGroup = null;
+        switch (groupType){
+            case PRACTICE:
+                practiceGroup = practiceGroupDao.get(Long.parseLong(musicGroupId));
+                teacherIds.add(practiceGroup.getEducationalTeacherId());
+                break;
+            case COMM:
+                coursesGroup = coursesGroupDao.get(Long.parseLong(musicGroupId));
+                teacherIds.add(coursesGroup.getEducationalTeacherId());
+                break;
+            case VIP:
+                vipGroup = vipGroupDao.get(Long.parseLong(musicGroupId));
+                teacherIds.add(vipGroup.getEducationalTeacherId());
+                break;
+        }
+        teacherIds.removeAll(Collections.singleton(null));
         if(teacherIds.size() > 0){
             List<ImUserModel> userModels = teacherDao.queryTeacherImModel(teacherIds);
-            userModels.forEach(e->{
+            for (ImUserModel e : userModels) {
                 if(musicGroup != null){
                     if(musicGroup.getTeamTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTeamTeacherId()){
                         e.setTitle("运营主管");
@@ -749,10 +777,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
                         e.setTitle("指导老师");
                     }
-                }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
-                    e.setTitle("指导老师");
+                }else{
+                    if(groupType == PRACTICE && practiceGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == practiceGroup.getEducationalTeacherId()){
+                        e.setTitle("教务老师");
+                    }else if(groupType == VIP && vipGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == vipGroup.getEducationalTeacherId()){
+                        e.setTitle("教务老师");
+                    }else if(groupType == COMM && coursesGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == coursesGroup.getEducationalTeacherId()){
+                        e.setTitle("教务老师");
+                    }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
+                        e.setTitle("指导老师");
+                    }
                 }
-            });
+            };
             students.addAll(userModels);
         }
         return students;

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

@@ -140,6 +140,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CourseScheduleReview addPracticeGroupReview(CourseScheduleReview courseScheduleReview) {
         Integer courseScheduleId = courseScheduleReview.getCourseScheduleId();
         if (courseScheduleId == null || courseScheduleId <= 0) {
@@ -165,6 +166,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         if(StringUtils.isNotBlank(courseScheduleReview.getHomeWork())){
             //新增课堂作业
             CourseHomework courseHomework=new CourseHomework();
+            courseHomework.setContent(courseScheduleReview.getHomeWork());
             courseHomework.setCourseScheduleId(courseSchedule.getId());
             courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
             courseHomework.setGroupType(courseSchedule.getGroupType());
@@ -228,6 +230,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CourseScheduleReview updateReview(CourseScheduleReview courseScheduleReview) {
         if (courseScheduleReview.getId() == null || courseScheduleReview.getId() <= 0) {
             throw new BizException("评论id为空");
@@ -239,8 +242,40 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         courseScheduleReviewDao.update(courseScheduleReview);
 
         if(StringUtils.isNotBlank(courseScheduleReview.getHomeWork())){
-            CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseScheduleReview.getCourseScheduleId().longValue());
-            if(!homework.getContent().equals(courseScheduleReview.getHomeWork())){
+            Date date=new Date();
+            CourseSchedule courseSchedule = courseScheduleDao.get(review.getCourseScheduleId().longValue());
+            CourseHomework homework = courseHomeworkDao.findByCourseSchedule(review.getCourseScheduleId().longValue());
+            if(Objects.isNull(homework)){
+                if(StringUtils.isNotBlank(courseScheduleReview.getHomeWork())){
+                    //新增课堂作业
+                    CourseHomework courseHomework=new CourseHomework();
+                    courseHomework.setContent(courseScheduleReview.getHomeWork());
+                    courseHomework.setCourseScheduleId(courseSchedule.getId());
+                    courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
+                    courseHomework.setGroupType(courseSchedule.getGroupType());
+                    courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
+                    courseHomework.setExpiryDate(DateUtil.addDays(date,7));
+                    List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
+
+                    courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments)?0:courseScheduleStudentPayments.size());
+                    courseHomeworkService.insert(courseHomework);
+
+                    if(!CollectionUtils.isEmpty(courseScheduleStudentPayments)){
+                        List<StudentCourseHomework> studentCourseHomeworks=new ArrayList<>();
+                        for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
+                            StudentCourseHomework studentCourseHomework=new StudentCourseHomework();
+                            studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
+                            studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
+                            studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
+                            studentCourseHomework.setStatus(YesOrNoEnum.NO);
+                            studentCourseHomework.setIsView(YesOrNoEnum.NO);
+                            studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
+                            studentCourseHomeworks.add(studentCourseHomework);
+                        }
+                        studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
+                    }
+                }
+            }else if(Objects.isNull(homework.getContent())||!homework.getContent().equals(courseScheduleReview.getHomeWork())){
                 homework.setContent(courseScheduleReview.getHomeWork());
                 courseHomeworkDao.update(homework);
             }

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

@@ -1105,16 +1105,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         teacherIds.addAll(teacherDao.findVipTeacherIds(studentId));
         //获取陪练课老师列表
         teacherIds.addAll(teacherDao.findPracticeTeacherIds(studentId));
-        //获取陪练课,vip课代课老师关联
+        //获取对外课程老师列表
         teacherIds.addAll(teacherDao.findCloseCourseTeacherIds(studentId));
         //获取陪练课课程教务老师
-//        teacherIds.addAll(teacherDao.findPracticeEducationalTeacherId(studentId));
+        teacherIds.addAll(teacherDao.findPracticeEducationalTeacherId(studentId));
         //获取VIP课程教务老师
-//        teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
+        teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
+        //获取对外课程务老师
+        teacherIds.addAll(teacherDao.findCommEducationalTeacherId(studentId));
         if(teacherIds.size() > 0){
         	return teacherDao.queryTeacherBaseInfo(teacherIds,search);
         }
-        return new ArrayList<BasicUserDto>();
+        return new ArrayList<>();
     }
 
     @Override

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

@@ -4,10 +4,12 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.CourseHomeworkDao;
 import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleReviewDao;
 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -21,7 +23,6 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
-
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +46,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
 	@Autowired
 	private SysMessageService sysMessageService;
+	@Autowired
+	private CourseScheduleReviewDao courseScheduleReviewDao;
 
 	@Override
 	public BaseDAO<Long, StudentCourseHomework> getDAO() {
@@ -85,6 +88,15 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 		courseHomework.setGroupType(courseSchedule.getGroupType());
 		courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
 
+		CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
+		if(temp.getExpectNum().equals(courseHomework.getCompletedNum())){
+			CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(),bean.getUserId());
+			if(Objects.nonNull(review)){
+				review.setHandHomework(YesOrNoEnum.YES.getCode());
+			}
+			courseScheduleReviewDao.update(review);
+		}
+
 		return courseHomeworkService.update(courseHomework);
 	}
 

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

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;

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

@@ -189,6 +189,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		}
 		//获取课程关联的学生列表
 		teachers.addAll(teacherDao.findCloseCourseStudentIds(teacherId, search));
+		//获取相关vip陪练教务的学员编号
+		teachers.addAll(teacherDao.findVipEducationalStudentId(teacherId,search));
+		teachers.addAll(teacherDao.findCommEducationalStudentId(teacherId,search));
+		teachers.addAll(teacherDao.findPracticeEducationalStudentId(teacherId,search));
+
 		return teachers.stream().distinct().collect(Collectors.toList());
 	}
 
@@ -360,11 +365,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public List<BasicUserDto> queryEducationIpa(Integer userId, String search) {
-		List<BasicUserDto> basicUserDtos = queryGroupStudents(userId, search);
+//		List<BasicUserDto> basicUserDtos = queryGroupStudents(userId, search);
 		//获取当前管理人员所在分部，所有老师，以及没有乐团的学生
-		List<BasicUserDto> userDtos = teacherDao.queryEducationIpa(userId, search);
-		userDtos.addAll(basicUserDtos);
-		return userDtos.stream().distinct().collect(Collectors.toList());
+//		List<BasicUserDto> userDtos = teacherDao.queryEducationIpa(userId, search);
+//		userDtos.addAll(basicUserDtos);
+//		return userDtos.stream().distinct().collect(Collectors.toList());
+		return queryGroupStudents(userId, search);
 	}
 
 	@Override

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -271,10 +271,9 @@
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_
         FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
-        LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
         <where>
-            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2)
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND mg.status_ = 'PROGRESS' AND cgsm.group_type_ = 'MUSIC'
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>
@@ -291,7 +290,23 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_
         <where>
-            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND vg.group_status_ = 4
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND vg.group_status_ = 4 AND cgsm.group_type_ = 'VIP'
+            <if test="userId != null">
+                AND cgsm.user_id_ = #{userId}
+            </if>
+            <if test="search != null and search != ''">
+                AND cg.name_ LIKE CONCAT('%',#{search},'%')
+            </if>
+        </where>
+        GROUP BY cg.id_
+    </select>
+    <select id="queryUserCommGroups" resultMap="imGroupModel">
+        SELECT cg.id_,cg.name_,cg.student_num_,cg.img_
+        FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        LEFT JOIN courses_group vg ON vg.id_ = cg.music_group_id_
+        <where>
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND vg.status_ = 'NORMAL' AND cgsm.group_type_ = 'COMM'
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>
@@ -385,8 +400,10 @@
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
         LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
         LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
-        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
-        AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2)
+        LEFT JOIN courses_group csg ON csg.id_ = cg.music_group_id_ AND cg.group_type_ = 'COMM'
+        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR
+        mg.director_user_id_ = #{userId} OR csg.educational_teacher_id_ = #{userId} OR vg.educational_teacher_id_ = #{userId})
+        AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR csg.status_ = 'NORMAL')
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>

mec-biz/src/main/resources/config/mybatis/CourseScheduleReviewMapper.xml

@@ -246,6 +246,7 @@
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         <include refid="practiceGroupReviews4EduQueryCondition"/>
     </select>
-
-
-</mapper>
+    <select id="findByCourseScheduleAndStudent" resultMap="CourseScheduleReview">
+        SELECT * FROM course_schedule_review WHERE course_schedule_id_=#{courseScheduleId} AND student_id_=#{studentId}
+    </select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/CoursesGroupMapper.xml

@@ -26,6 +26,7 @@
 		<result column="total_course_discount_price_" property="totalCourseDiscountPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="educational_teacher_id_" property="educationalTeacherId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -40,13 +41,13 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CoursesGroup" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO courses_group (id_,name_,subject_id_,courses_start_date_,courses_end_date_,teaching_arrangement_,organ_id_,single_class_minutes_,status_,memo_,teacher_id_,max_student_num_,apply_closing_date_,teaching_plan_,teacher_salary_settlement_method_,total_courses_price_,total_course_discount_price_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{subjectId},#{coursesStartDate},#{coursesEndDate},#{teachingArrangement},#{organId},#{singleClassMinutes},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{teacherId},#{maxStudentNum},#{applyClosingDate},#{teachingPlan},#{teacherSalarySettlementMethod},#{totalCoursesPrice},#{totalCourseDiscountPrice},NOW(),NOW())
+		INSERT INTO courses_group (id_,name_,subject_id_,courses_start_date_,courses_end_date_,teaching_arrangement_,
+		organ_id_,single_class_minutes_,status_,memo_,teacher_id_,max_student_num_,apply_closing_date_,
+		teaching_plan_,teacher_salary_settlement_method_,total_courses_price_,total_course_discount_price_,create_time_,update_time_,educational_teacher_id_)
+		VALUES(#{id},#{name},#{subjectId},#{coursesStartDate},#{coursesEndDate},#{teachingArrangement},
+		#{organId},#{singleClassMinutes},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		#{memo},#{teacherId},#{maxStudentNum},#{applyClosingDate},#{teachingPlan},#{teacherSalarySettlementMethod},
+		#{totalCoursesPrice},#{totalCourseDiscountPrice},NOW(),NOW(),#{educationalTeacherId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -56,6 +57,9 @@
 			<if test="coursesEndDate != null">
 				courses_end_date_ = #{coursesEndDate},
 			</if>
+			<if test="educationalTeacherId != null">
+				educational_teacher_id_ = #{educationalTeacherId},
+			</if>
 			<if test="subjectId != null">
 				subject_id_ = #{subjectId},
 			</if>

mec-biz/src/main/resources/config/mybatis/DemoGroupMapper.xml

@@ -307,18 +307,17 @@
 		select sum(case when dgcp.status_ = 0 then 1 else 0 end) unbooked_num_,
 		sum(case when dgcp.status_ = 1 then 1 else 0 end) booked_num_
 		from demo_group_courses_plan dgcp left join demo_group dg on dgcp.demo_group_id_ = dg.id_
-		<where>
-            <if test="organIds != null">
-                AND INTE_ARRAY(dg.organ_id_list_,#{organIds})
-            </if>
-    	</where> 
+		where INTE_ARRAY(dg.organ_id_list_,'36,38') = 0
+        <if test="organIds != null">
+            AND INTE_ARRAY(dg.organ_id_list_,#{organIds})
+        </if>
 	</select>
     
     <select id="queryCurrentMonthCoursesNum" resultType="int">
     	select count(cs.id_) from course_schedule cs
         left join demo_group vg on cs.music_group_id_ = vg.id_
         where cs.type_ = 'DEMO'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and INTE_ARRAY(vg.organ_id_list_,'36,38') = 0
         <if test="organIds != null">
             AND INTE_ARRAY(vg.organ_id_list_,#{organIds})
         </if>

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -304,11 +304,10 @@
     
   	<select id="queryOrganMusicGroupNum" resultType="map">
     	select count(*) total,sum(case when status_ = 'PREPARE' then 1 else 0 end) prepare_num_,sum(case when status_ = 'PROGRESS' then 1 else 0 end) progress_num_,sum(case when status_ = 'PAUSE' then 1 else 0 end) pause_num_ from music_group
-    	<where>
-    		<if test="organId != null">
-    			FIND_IN_SET(organ_id_,#{organId})
-    		</if>
-    	</where>
+   		where organ_id_ not in (36,38)
+   		<if test="organId != null">
+   			and FIND_IN_SET(organ_id_,#{organId})
+   		</if>
   	</select>
   	
   	<select id="queryCurrentMonthCoursesNum" resultType="int">
@@ -316,7 +315,7 @@
 		left join class_group cg on cs.class_group_id_ = cg.id_
 		left join music_group mg on cg.music_group_id_ = mg.id_
 		where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and mg.organ_id_ not in (36,38)
    		<if test="organId != null">
    			AND FIND_IN_SET(mg.organ_id_,#{organId})
    		</if>

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -13,6 +13,7 @@
         <result property="currentCLassTimes" column="current_class_times_" />
         <result property="totalClassTimes" column="total_class_times_" />
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="courseStatus" column="courseStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap id="studentManageAccountBaseInfo" type="com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto">
@@ -249,10 +250,12 @@
     <sql id="studentManageAttendanceQueryCondition">
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND CONCAT(cs.class_date_," ",cs.start_class_time_) &lt; NOW()
             <if test="studentId!=null">
                 AND cssp.user_id_ = #{studentId}
             </if>
+            <if test="courseStatus != null">
+                AND cs.status_ = #{courseStatus}
+            </if>
             <if test="classGroupType!=null">
                 AND cg.type_ = #{classGroupType}
             </if>
@@ -280,7 +283,8 @@
             su.real_name_ teacher_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
             sa.current_class_times_,
-            cg.total_class_times_
+            cg.total_class_times_,
+            cs.status_ courseStatus
         FROM course_schedule_student_payment cssp
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
             LEFT JOIN class_group cg ON cssp.class_group_id_ = cg.id_

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -522,7 +522,7 @@
     <select id="queryIncomeStatisticsWithCurrentMonth" resultType="map">
         select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
         where actual_amount_ &gt; 0 and DATE_FORMAT(create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) AND
-        status_ = 'SUCCESS'
+        status_ = 'SUCCESS' and organ_id_ not in (36,38)
         <if test="organId != null">
             and FIND_IN_SET(organ_id_,#{organId})
         </if>

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -502,11 +502,10 @@
     <select id="queryStudentNum" resultType="map">
         SELECT count(distinct sr.user_id_) total_num_,sum(case when sr.create_time_ >= timestamp(date_add(curdate(), interval - day(curdate()) + 1 day)) then 1 else 0 end) new_num_,sum(case when sr.music_group_status_ = 'QUIT' and sr.update_time_ >= timestamp(date_add(curdate(), interval - day(curdate()) + 1 day)) then 1 else 0 end) quit_num_
         FROM student_registration sr left join music_group mg on sr.music_group_id_ = mg.id_
-        <where>
-    		<if test="organId != null">
-    			AND FIND_IN_SET(mg.organ_id_,#{organId})
-    		</if>
-    	</where>
+        where mg.organ_id_ not in (36,38)
+   		<if test="organId != null">
+   			AND FIND_IN_SET(mg.organ_id_,#{organId})
+   		</if>
     </select>
     <select id="findMapByMusicGroupId" resultType="java.util.Map">
         SELECT sr.user_id_ 'key',MIN(sr.parents_phone_) 'value' FROM student_registration sr

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -194,7 +194,7 @@
         sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then sucad.amount_ else 0 end) expend_total_ from
         sys_user_cash_account_detail sucad
         left join sys_user u on sucad.user_id_ = u.id_
-        where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
+        where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) and u.organ_id_ not in (36,38)
         <if test="organId != null">
             AND FIND_IN_SET(u.organ_id_,#{organId})
         </if>

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -662,7 +662,7 @@
     <select id="queryOrganTeacherNum" resultType="map">
         select count(*) total,sum(case when job_nature_ = 'PART_TIME' then 1 else 0 end) part_time_num_,sum(case when
         job_nature_ = 'FULL_TIME' then 1 else 0 end) full_time_num_ from teacher
-        where demission_date_ is null
+        where demission_date_ is null and organ_id_ not in (36,38)
             <if test="organId != null">
                 and FIND_IN_SET(organ_id_,#{organId})
             </if>
@@ -898,6 +898,31 @@
         </if>
         GROUP BY su.id_
     </select>
+
+    <select id="findVipEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
+        FROM vip_group vg
+        LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+        LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+        WHERE cssp.group_type_ = 'VIP' AND vg.educational_teacher_id_ = #{teacherId}
+        GROUP BY su.id_
+    </select>
+    <select id="findCommEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
+        FROM courses_group vg
+        LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+        LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+        WHERE cssp.group_type_ = 'COMM' AND vg.educational_teacher_id_ = #{teacherId}
+        GROUP BY su.id_
+    </select>
+    <select id="findPracticeEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
+        FROM practice_group pg
+        LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = pg.id_
+        LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+        WHERE cssp.group_type_ = 'PRACTICE' AND pg.educational_teacher_id_ = #{teacherId}
+        GROUP BY su.id_
+    </select>
     <select id="findPracticeEducationalTeacherId" resultType="java.lang.Integer">
         SELECT DISTINCT pg.educational_teacher_id_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group_teacher_mapper cgtm ON cgsm.class_group_id_ = cgtm.class_group_id_
@@ -910,4 +935,10 @@
         LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_
         WHERE cgsm.group_type_ = 'VIP' AND cgsm.user_id_ = #{userId}
     </select>
+    <select id="findCommEducationalTeacherId" resultType="java.lang.Integer">
+        SELECT DISTINCT vg.educational_teacher_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgsm.class_group_id_ = cgtm.class_group_id_
+        LEFT JOIN courses_group vg ON vg.id_ = cgsm.music_group_id_
+        WHERE cgsm.group_type_ = 'COMM' AND cgsm.user_id_ = #{userId}
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -741,16 +741,15 @@
     
     <select id="queryVipGroupNum" resultType="map">
     	select count(*) total,sum(case when group_status_ = 2 then 1 else 0 end) applying_num_,sum(case when group_status_ = 4 then 1 else 0 end) finished_num_ from vip_group
-    	<where>
-    		<if test="organId != null">
-                FIND_IN_SET(organ_id_,#{organId})
-    		</if>
-    	</where>
+    	where organ_id_ not in (36,38)
+   		<if test="organId != null">
+              and FIND_IN_SET(organ_id_,#{organId})
+   		</if>
     </select>
     
     <select id="queryCurrentMonthCoursesNum" resultType="int">
     	select count(cs.id_) from course_schedule cs left join vip_group vg on cs.music_group_id_ = vg.id_ where cs.type_ in ('VIP')
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and  vg.organ_id_ not in (36,38)
    		<if test="organId != null">
    		    AND FIND_IN_SET(vg.organ_id_,#{organId})
    		</if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseReviewController.java

@@ -2,32 +2,20 @@ package com.ym.mec.teacher.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleEvaluate;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.CourseReviewQueryInfo;
-import com.ym.mec.biz.dal.page.PracticeGroupQueryInfo;
 import com.ym.mec.biz.service.CourseReviewService;
-import com.ym.mec.biz.service.CourseScheduleEvaluateService;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 @RequestMapping("courseReview")
@@ -78,7 +66,7 @@ public class CourseReviewController extends BaseController {
     }
 
     @ApiOperation(value = "修改评论信息")
-    @GetMapping("updateReviewInfo")
+    @PostMapping("updateReviewInfo")
     public HttpResponseResult updateReviewInfo(CourseScheduleReview courseScheduleReview) {
         return succeed(courseReviewService.updateReview(courseScheduleReview));
     }