Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -50,4 +50,10 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * @return
      */
     List<CourseScheduleComplaints> findByCourseIdAndUserId(@Param("courseIds") List<Long> courseIds, @Param("userId") Integer userId);
+
+    /**
+     * 根据课程id获取用户评价
+     * @return
+     */
+    List<CourseScheduleComplaints> findComplaintsByCourseScheduleIds(@Param("ids") List<Long> ids);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseReviewDto.java

@@ -93,6 +93,9 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "回访日期",required = false)
     private Date createTime;
 
+    @ApiModelProperty(value = "更新时间",required = false)
+    private Date updateTime;
+
     @ApiModelProperty(value = "回访日期Str",required = false)
     private String createTimeStr;
 
@@ -390,4 +393,12 @@ public class CourseReviewDto {
     public void setMusicTheoryStr(String musicTheoryStr) {
         this.musicTheoryStr = musicTheoryStr;
     }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

@@ -411,7 +411,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param courseGenerateDto: 排课信息
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
 	 */
-	List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateDto);
+	List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateDto, boolean excludePastCourse);
 
 	/**
 	 * @describe 终极课表获取接口

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

@@ -377,8 +377,8 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         if (coursesList.size() > 0) {
             List<Long> courseIds = coursesList.stream().map(courseReviewDto -> courseReviewDto.getId().longValue()).collect(Collectors.toList());
             List<CourseScheduleReview> reviews = courseScheduleReviewDao.findByCourseSchedules(courseIds);
-            courseReviewsMap = reviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getId));
-            List<CourseScheduleComplaints> studentReviewsList = courseScheduleComplaintsDao.findByCourseScheduleIds(courseIds);
+            courseReviewsMap = reviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getCourseScheduleId));
+            List<CourseScheduleComplaints> studentReviewsList = courseScheduleComplaintsDao.findComplaintsByCourseScheduleIds(courseIds);
             courseComplaintsMap = studentReviewsList.stream().collect(Collectors.groupingBy(CourseScheduleComplaints::getCourseScheduleId));
         }
         for (CourseReviewDto course : coursesList) {

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

@@ -3495,7 +3495,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
-    public List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateInfo) {
+    public List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateInfo, boolean excludePastCourse) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(courseGenerateInfo.getCourseCreateStartTime());
 
@@ -3513,6 +3513,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
 
         List<CourseSchedule> courseSchedules = new ArrayList<>();
+        Date now=new Date();
 
         while (true) {
             if (courseGenerateInfo.isSkipHoliday() && !holiday.containsKey(calendar.get(Calendar.YEAR))) {
@@ -3540,6 +3541,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
                     dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
                     Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
+                    if(excludePastCourse&&courseStartTime.before(now)){
+                    	continue;
+					}
                     Date courseEndTime = DateUtil.addMinutes(courseStartTime, courseGenerateInfo.getSingleClassMinutes());
                     CourseSchedule courseSchedule = new CourseSchedule();
                     courseSchedule.setClassDate(courseStartTime);

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

@@ -123,10 +123,13 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         Integer totalCourseTime=courseCycleInfo.getCourseCount()*courseCycleInfo.getSingleClassMinutes();
         sysTenantAccountService.update(courseGroup.getTeacherId(), -totalCourseTime, "", SysTenantAccountDetail.TransType.CONSUME, "",BigDecimal.ZERO,"课程组创建");
 
+        Teacher teacher = teacherDao.get(courseGroup.getTeacherId());
+
         Date now=new Date();
         courseGroup.setSingleClassMinutes(courseCycleInfo.getSingleClassMinutes());
         courseGroup.setStatus(GroupStatusEnum.NORMAL);
-        List<CourseSchedule> newCourses = courseScheduleService.createCourses(courseGroupCreateInfo.getCourseCycleInfo());
+        courseGroup.setOrganId(teacher.getOrganId());
+        List<CourseSchedule> newCourses = courseScheduleService.createCourses(courseGroupCreateInfo.getCourseCycleInfo(),true);
         for (CourseSchedule newCourse : newCourses) {
             newCourse.setTeachMode(TeachModeEnum.ONLINE);
             newCourse.setGroupType(GroupType.COMM);

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

@@ -1681,7 +1681,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			Map<String, Object> courseInfo1 = JSON.parseObject(studentPauseInfo1.getCoursesJson(), Map.class);
 			Integer[] teachModeSequence1=JSON.parseArray(courseInfo1.get("teaChModeSequence").toString(), Integer.class).stream().toArray(Integer[]::new);
 			studentRecoverInfo.setCourseCount(teachModeSequence1.length);
-			List<CourseSchedule> newCourseSchedules = courseScheduleService.createCourses(studentRecoverInfo);
+			List<CourseSchedule> newCourseSchedules = courseScheduleService.createCourses(studentRecoverInfo,false);
 			for(int i=0;i<newCourseSchedules.size();i++){
 				if(newCourseSchedules.get(i).getStartClassTime().before(now)){
 					throw new BizException("排课起始时间不得小于当前时间");

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

@@ -132,4 +132,10 @@
 		</foreach>
 		AND user_id_ = #{userId}
 	</select>
+	<select id="findComplaintsByCourseScheduleIds" resultMap="CourseScheduleComplaints">
+		SELECT * FROM course_schedule_complaints WHERE course_schedule_id_ IN
+		<foreach collection="ids" item="id" open="(" close=")" separator=",">
+			#{id}
+		</foreach>
+	</select>
 </mapper>

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

@@ -28,13 +28,17 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO course_schedule_evaluate (music_group_id_, class_group_id_, course_schedule_id_, music_theory_,
-                                              song_,times_,total_minutes_,
-                                              teaching_material_, teacher_id_, item_, comment_, create_time_,update_time_,
+                                              song_, times_, total_minutes_,
+                                              teaching_material_, teacher_id_, item_, comment_, create_time_,
+                                              update_time_,
                                               student_id_list_, version_, status_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{classGroupId,jdbcType=INTEGER}, #{courseScheduleId,jdbcType=BIGINT},
-                #{musicTheory,jdbcType=VARCHAR}, #{song,jdbcType=VARCHAR},#{times,jdbcType=INTEGER},#{totalMinutes},#{teachingMaterial,jdbcType=VARCHAR},
-                #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-                #{updateTime,jdbcType=TIMESTAMP},#{studentIdList}, #{version,jdbcType=INTEGER}, #{status,jdbcType=TINYINT})
+                #{musicTheory,jdbcType=VARCHAR}, #{song,jdbcType=VARCHAR}, #{times,jdbcType=INTEGER}, #{totalMinutes},
+                #{teachingMaterial,jdbcType=VARCHAR},
+                #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR},
+                #{createTime,jdbcType=TIMESTAMP},
+                #{updateTime,jdbcType=TIMESTAMP}, #{studentIdList}, #{version,jdbcType=INTEGER},
+                #{status,jdbcType=TINYINT})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate">
@@ -90,7 +94,9 @@
     </update>
 
     <select id="get" resultMap="CourseScheduleEvaluate">
-        SELECT * FROM course_schedule_evaluate WHERE id_ = #{id}
+        SELECT *
+        FROM course_schedule_evaluate
+        WHERE id_ = #{id}
     </select>
 
     <select id="findByClassGroupId" resultMap="CourseScheduleEvaluate">
@@ -98,7 +104,9 @@
         FROM course_schedule_evaluate cse
                  LEFT JOIN practice_group pg ON pg.id_ = cse.music_group_id_
                  LEFT JOIN subject s on s.id_ = pg.subject_id_
-        WHERE cse.class_group_id_ = #{classGroupId} AND status_=1 AND version_=1
+        WHERE cse.class_group_id_ = #{classGroupId}
+          AND status_ = 1
+          AND version_ = 1
         ORDER BY create_time_ DESC
         LIMIT 1
     </select>
@@ -133,13 +141,12 @@
 
     <!-- 已购买人数 -->
     <select id="getPracticeGroupsBuy" resultMap="PracticeGroupsOrgan">
-        SELECT pg.organ_id_, count(*) buy_nums_
-        FROM class_group cg
-                 LEFT JOIN practice_group pg on cg.music_group_id_ = pg.id_
-        WHERE cg.group_type_ = 'PRACTICE'
-          AND pg.buy_months_ >= 1
-          AND pg.group_status_ != 'LOCK'
-        GROUP BY pg.organ_id_
+        SELECT organ_id_, count(distinct student_id_) buy_nums_
+        FROM practice_group
+        WHERE group_status_ != 'LOCK'
+          AND group_status_ != 'CANCEL'
+          AND buy_months_ >= 1
+        GROUP BY organ_id_
     </select>
 
     <!-- 报告完成数 -->
@@ -178,7 +185,8 @@
     <select id="findExpiredDateBeforeReport" resultMap="CourseScheduleEvaluate">
         SELECT *
         FROM course_schedule_evaluate
-        WHERE status_ = 1 AND create_time_ &lt;= #{expiredDate}
+        WHERE status_ = 1
+          AND create_time_ &lt;= #{expiredDate}
           AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
     </select>
 
@@ -208,7 +216,8 @@
     </select>
 
     <select id="getNeedPostReports" resultMap="CourseScheduleEvaluate">
-        SELECT cse.id_,cse.class_group_id_,DATE_FORMAT(cse.create_time_,'%Y年%m月') month_,pg.name_ group_name_,cse.teacher_id_ FROM course_schedule_evaluate cse
+        SELECT cse.id_,cse.class_group_id_,DATE_FORMAT(cse.create_time_,'%Y年%m月') month_,pg.name_
+        group_name_,cse.teacher_id_ FROM course_schedule_evaluate cse
         LEFT JOIN practice_group pg on cse.music_group_id_ = pg.id_ WHERE status_= 0
         <if test="teacherId != null">
             AND cse.teacher_id_ = #{teacherId}
@@ -218,20 +227,28 @@
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO course_schedule_evaluate (music_group_id_, class_group_id_, course_schedule_id_, music_theory_,
-        song_,teaching_material_, teacher_id_, item_, comment_, create_time_,update_time_,student_id_list_, version_, status_,
+        song_,teaching_material_, teacher_id_, item_, comment_, create_time_,update_time_,student_id_list_, version_,
+        status_,
         times_,total_minutes_)
         VALUE
         <foreach collection="list" item="evaluate" separator=",">
-            (#{evaluate.musicGroupId,jdbcType=VARCHAR}, #{evaluate.classGroupId,jdbcType=INTEGER}, #{evaluate.courseScheduleId,jdbcType=BIGINT},
-            #{evaluate.musicTheory,jdbcType=VARCHAR}, #{evaluate.song,jdbcType=VARCHAR}, #{evaluate.teachingMaterial,jdbcType=VARCHAR},
-            #{evaluate.teacherId,jdbcType=INTEGER}, #{evaluate.item,jdbcType=VARCHAR}, #{evaluate.comment,jdbcType=LONGVARCHAR}, #{evaluate.createTime,jdbcType=LONGVARCHAR},
-            #{evaluate.updateTime,jdbcType=LONGVARCHAR}, #{evaluate.studentIdList}, #{evaluate.version,jdbcType=INTEGER}, #{evaluate.status,jdbcType=TINYINT},
+            (#{evaluate.musicGroupId,jdbcType=VARCHAR}, #{evaluate.classGroupId,jdbcType=INTEGER},
+            #{evaluate.courseScheduleId,jdbcType=BIGINT},
+            #{evaluate.musicTheory,jdbcType=VARCHAR}, #{evaluate.song,jdbcType=VARCHAR},
+            #{evaluate.teachingMaterial,jdbcType=VARCHAR},
+            #{evaluate.teacherId,jdbcType=INTEGER}, #{evaluate.item,jdbcType=VARCHAR},
+            #{evaluate.comment,jdbcType=LONGVARCHAR}, #{evaluate.createTime,jdbcType=LONGVARCHAR},
+            #{evaluate.updateTime,jdbcType=LONGVARCHAR}, #{evaluate.studentIdList},
+            #{evaluate.version,jdbcType=INTEGER}, #{evaluate.status,jdbcType=TINYINT},
             #{evaluate.times,jdbcType=INTEGER},#{evaluate.totalMinutes,jdbcType=INTEGER})
         </foreach>
     </insert>
 
     <select id="getClassGroupCourseTimes" resultType="int">
-        SELECT COUNT(*) FROM course_schedule WHERE class_group_id_ = #{classGroupId} AND (del_flag_=0 OR del_flag_ IS NULL)
+        SELECT COUNT(*)
+        FROM course_schedule
+        WHERE class_group_id_ = #{classGroupId}
+          AND (del_flag_ = 0 OR del_flag_ IS NULL)
     </select>
 
     <select id="hasReportList" resultMap="CourseScheduleEvaluate">

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

@@ -619,7 +619,7 @@
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
         </if>
-        AND csts.user_id_ = #{teacherId} AND cg.del_flag_ = 0
+        AND csts.user_id_ = #{teacherId}
         ORDER BY start_class_time_
     </select>
 
@@ -848,7 +848,6 @@
           (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
         AND csts.user_id_ = #{teacherId}
-        AND cg.del_flag_ = 0
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>

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

@@ -150,6 +150,7 @@
         <result column="song_" property="song"/>
         <result column="memo_" property="memo"/>
         <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
         <result column="has_liaison_" property="hasLiaison"/>
         <result column="student_id_" property="studentId"/>
     </resultMap>
@@ -217,7 +218,7 @@
         teacher_name_,edsu.real_name_
         edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_
         student_review_,csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
-        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_
+        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.create_time_,csr.update_time_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_

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

@@ -816,7 +816,7 @@
             #{userId}
         </foreach>
         <if test="search != null and search != ''">
-            AND su.real_name_ LIKE CONCAT('%',#{search},'%')
+            AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
         </if>
         GROUP BY su.id_
     </select>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -99,30 +99,19 @@ public class RoomServiceImpl implements RoomService {
 
         log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
 
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        String userId = sysUser.getId().toString();
+        String userId = sysUserFeignService.queryUserInfo().getId().toString();
         Teacher teacher = teacherDao.get(Integer.parseInt(userId));
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
         try {
             if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                 teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),courseSchedule.getActualTeacherId(), SignStatusEnum.SIGN_IN,true);
-                if(teacher.getTeacherOrganId() == lesseeOrganId){
-                    roomId = "I" + roomId;
-                }else {
-                    roomId = "S" + roomId;
-                }
             }else {
                 studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
-                if(sysUser.getOrganId() == lesseeOrganId){
-                    roomId = "I" + roomId;
-                }else {
-                    roomId = "S" + roomId;
-                }
             }
         }catch (Exception e){
             e.printStackTrace();
         }
-//        roomId = "DAYA" + roomId;
+        roomId = "DAYA" + roomId;
         String display = "";
         Date curTime = DateTimeUtils.currentUTC();
         List<Room> roomList = roomDao.findByRid(roomId);
@@ -263,12 +252,12 @@ public class RoomServiceImpl implements RoomService {
         SysUser user = sysUserFeignService.queryUserInfo();
         String userId = user.getId().toString();
         Teacher teacher = teacherDao.get(user.getId());
-        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
+        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
         try {
             if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), SignStatusEnum.SIGN_OUT,true);
+                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
             }else {
-                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
+                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -969,7 +958,7 @@ public class RoomServiceImpl implements RoomService {
         roomMemberDao.updateRoleByRidAndUid(roomId, userId, taskInfo.getRole().getValue());
 
         UpgradeRoleMessage msg = new UpgradeRoleMessage(ActionEnum.Approve.ordinal());
-        
+
         msg.setOpUserName(authUser.getUsername());
         msg.setOpUserId(userId);
         msg.setRole(taskInfo.getRole().getValue());
@@ -1066,7 +1055,7 @@ public class RoomServiceImpl implements RoomService {
         return true;
     }
 
-   @Override
+    @Override
     public Boolean memberOnlineStatus(List<ReqMemberOnlineStatus> statusList, String nonce, String timestamp, String signature) throws ApiException, Exception {
         String sign = imProperties.getSecret() + nonce + timestamp;
         String signSHA1 = CodeUtil.hexSHA1(sign);
@@ -1152,12 +1141,12 @@ public class RoomServiceImpl implements RoomService {
 //            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
-            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
+            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
             try {
                 if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
+                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
                 }else {
-                    studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
+                    studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
                 }
             }catch (Exception e){
                 e.printStackTrace();
@@ -1257,6 +1246,4 @@ public class RoomServiceImpl implements RoomService {
         }
         return result;
     }
-
-
-}
+}

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

@@ -75,4 +75,11 @@ public class CourseReviewController extends BaseController {
         return succeed(courseReviewService.getReviewInfo(id));
     }
 
+    @ApiOperation(value = "获取老师评价和学生评价")
+    @GetMapping("getStuAndTeaReview")
+    @PreAuthorize("@pcs.hasPermissions('courseReview/getStuAndTeaReview')")
+    public HttpResponseResult getStuAndTeaReview(Long courseId) {
+        return succeed(courseReviewService.getStuAndTeaReview(courseId));
+    }
+
 }