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

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

@@ -14,6 +14,8 @@ public class PracticeCourseDto extends PracticeGroup {
 
     private String subjectName;
 
+    private String eduTeacherName;
+
     public String getTeacherName() {
         return teacherName;
     }
@@ -37,4 +39,12 @@ public class PracticeCourseDto extends PracticeGroup {
     public void setSubjectName(String subjectName) {
         this.subjectName = subjectName;
     }
+
+    public String getEduTeacherName() {
+        return eduTeacherName;
+    }
+
+    public void setEduTeacherName(String eduTeacherName) {
+        this.eduTeacherName = eduTeacherName;
+    }
 }

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

@@ -121,6 +121,9 @@ public class CourseScheduleReview {
     @ApiModelProperty(value = "学生",required = false)
     private String studentAvatar;
 
+    @ApiModelProperty(value = "教务老师名字",required = false)
+    private String eduTeacherName;
+
     public Integer getId() {
         return id;
     }
@@ -325,4 +328,12 @@ public class CourseScheduleReview {
     public void setStudentAvatar(String studentAvatar) {
         this.studentAvatar = studentAvatar;
     }
+
+    public String getEduTeacherName() {
+        return eduTeacherName;
+    }
+
+    public void setEduTeacherName(String eduTeacherName) {
+        this.eduTeacherName = eduTeacherName;
+    }
 }

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

@@ -9,6 +9,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.enums.GroupType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,10 +29,6 @@ import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dto.CourseReviewDto;
-import com.ym.mec.biz.dal.dto.CourseScheduleComplaintsDto;
-import com.ym.mec.biz.dal.dto.ReviewInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherClassHeadInfo;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -262,6 +260,12 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseScheduleReview.getCourseScheduleId());
         courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
 
+        CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleReview.getCourseScheduleId().longValue());
+        if(courseSchedule.getGroupType().equals(GroupType.PRACTICE)){
+            PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
+            courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
+        }
+
         ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
         reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
         reviewInfoDto.setTeacherClassHeadInfo(teacherClassGroupInfo);

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

@@ -29,8 +29,7 @@
     </resultMap>
 
     <select id="get" parameterType="java.lang.Integer" resultMap="CourseScheduleReview">
-        select *
-        from course_schedule_review
+        select * from course_schedule_review
         where id_ = #{id,jdbcType=INTEGER}
     </select>
 
@@ -144,7 +143,6 @@
         <result column="class_date_Str_" jdbcType="VARCHAR" property="classDateStr"/>
         <result column="start_class_time_Str_" jdbcType="VARCHAR" property="startClassTimeStr"/>
         <result column="end_class_time_Str_" jdbcType="VARCHAR" property="endClassTimeStr"/>
-
     </resultMap>
 
     <sql id="practiceGroupReviewsQueryCondition">

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

@@ -32,6 +32,7 @@
         <result property="teacherName" column="real_name_"/>
         <result property="avatar" column="avatar_"/>
         <result property="subjectName" column="subject_name_"/>
+        <result property="eduTeacherName" column="edu_teacher_name_"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.PracticeGroupDto" id="PracticeGroupDto" extends="PracticeGroup">
@@ -370,9 +371,10 @@
     </select>
 
     <select id="findByGroupId" resultMap="PracticeCourseDto">
-        SELECT pg.*, s.name_ subject_name_
+        SELECT pg.*, s.name_ subject_name_,su.real_name_ edu_teacher_name_
         FROM practice_group pg
                  LEFT JOIN subject s on pg.subject_id_ = s.id_
+        LEFT JOIN sys_user su on pg.educational_teacher_id_ = su.id_
         WHERE pg.id_ = #{id}
     </select>
 </mapper>