Merge remote-tracking branch 'origin/master'

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

@@ -187,7 +187,7 @@
         <result property="portrait" column="avatar_"/>
     </resultMap>
     <select id="getBasic" resultMap="ImUserModel">
-        select CASE WHEN user_type_ LIKE '%STUDENT%' THEN username_ ELSE real_name_ END username_,id_,avatar_
+        select CASE WHEN user_type_ LIKE '%TEACHER%' OR user_type_ LIKE '%SYSTEM%' THEN real_name_ ELSE username_ END username_,id_,avatar_
         from sys_user where id_ = #{userId} LIMIT 1
     </select>
     

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CourseReviewDto;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
@@ -72,19 +73,32 @@ public interface CourseScheduleReviewDao extends BaseDAO<Integer, CourseSchedule
 
     /**
      * 获取已结束的课程列表
+     *
      * @param classGroupId
      * @return
      */
     List<CourseReviewDto> findByClassGroupId(@Param("classGroupId") Long classGroupId);
 
     /**
-     *
      * 根据课程id获取老师评价
+     *
      * @param courseScheduleId
      * @return
      */
     List<CourseScheduleReview> findByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
 
-    void batchAdd(@Param("courseScheduleReviews") List<CourseScheduleReview> courseScheduleReviews);
+    /**
+     * 批量插入评价
+     *
+     * @param courseScheduleReviews
+     * @return
+     */
+    int batchAdd(@Param("courseScheduleReviews") List<CourseScheduleReview> courseScheduleReviews);
 
+    /**
+     * 根据班级id获取班级学生
+     * @param classGroupId
+     * @return
+     */
+    List<SysUser> findStudentByClassGroupId(@Param("classGroupId") Long classGroupId);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,6 +27,8 @@ public class ReviewInfoDto {
     @ApiModelProperty(value = "教学内容",required = false)
     private String teachingMaterial;
 
+    @ApiModelProperty(value = "班级学生",required = false)
+    private List<SysUser> students;
 
     public TeacherClassHeadInfo getTeacherClassHeadInfo() {
         return teacherClassHeadInfo;
@@ -74,4 +77,12 @@ public class ReviewInfoDto {
     public void setTeachingMaterial(String teachingMaterial) {
         this.teachingMaterial = teachingMaterial;
     }
+
+    public List<SysUser> getStudents() {
+        return students;
+    }
+
+    public void setStudents(List<SysUser> students) {
+        this.students = students;
+    }
 }

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

@@ -410,6 +410,11 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             reviewInfoDto.setReview4StudentIds(review4StudentIds);
             reviewInfoDto.setTeachingMaterial(teacherReviews.get(0).getTeachingMaterial());
         }
+        //班级学生
+        List<SysUser> students = courseScheduleReviewDao.findStudentByClassGroupId(courseSchedule.getClassGroupId().longValue());
+        if (students.size() > 0) {
+            reviewInfoDto.setStudents(students);
+        }
         return reviewInfoDto;
     }
 
@@ -431,7 +436,10 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             courseScheduleReview.setClassGroupId(courseSchedule.getClassGroupId());
             courseScheduleReview.setTeacherId(teacherId);
         }
-        courseScheduleReviewDao.batchAdd(courseScheduleReviewList);
+        int nums = courseScheduleReviewDao.batchAdd(courseScheduleReviewList);
+        if (nums <= 0) {
+            throw new BizException("评价插入失败，请重试");
+        }
         return courseScheduleReviewList;
     }
 }

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

@@ -210,7 +210,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(studentIds.size() > 0){
 			teachers.addAll(teacherDao.queryTeacherBaseInfo(studentIds,search));
 		}
-		return teachers;
+		return teachers.stream().distinct().collect(Collectors.toList());
 	}
 
     @Override

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

@@ -327,4 +327,9 @@
                  LEFT JOIN sys_user stu on csr.student_id_ = t.id_
         WHERE csr.course_schedule_id_ = #{courseScheduleId}
     </select>
+
+    <select id="findStudentByClassGroupId" resultMap="com.ym.mec.biz.dal.dao.TeacherDao.SysUser">
+        SELECT su.id_, su.username_,su.avatar_ FROM  class_group_student_mapper cgsm
+        LEFT JOIN sys_user su on cgsm.user_id_ = su.id_ WHERE cgsm.class_group_id_ = #{classGroupId}
+    </select>
 </mapper>