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

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

@@ -70,4 +70,11 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @return
      */
     int delClassGroupTeacherMapper(@Param("classGroupIds") List<Integer> classGroupIds);
+
+    /**
+     * 获取助教名称列表
+     * @param classGroupId
+     * @return
+     */
+    String queryTeachingNames(Long classGroupId);
 }

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

@@ -14,8 +14,8 @@ public class TeacherClassHeadInfo {
     @ApiModelProperty(value = "主教名称")
     private String bishopTeacher;
 
-    @ApiModelProperty(value = "助教编号")
-    private Long teachingTeacherId;
+//    @ApiModelProperty(value = "助教编号")
+//    private Long teachingTeacherId;
 
     @ApiModelProperty(value = "助教名称")
     private String teachingTeacher;
@@ -80,13 +80,13 @@ public class TeacherClassHeadInfo {
         this.bishopTeacher = bishopTeacher;
     }
 
-    public Long getTeachingTeacherId() {
-        return teachingTeacherId;
-    }
-
-    public void setTeachingTeacherId(Long teachingTeacherId) {
-        this.teachingTeacherId = teachingTeacherId;
-    }
+//    public Long getTeachingTeacherId() {
+//        return teachingTeacherId;
+//    }
+//
+//    public void setTeachingTeacherId(Long teachingTeacherId) {
+//        this.teachingTeacherId = teachingTeacherId;
+//    }
 
     public String getTeachingTeacher() {
         return teachingTeacher;

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

@@ -848,11 +848,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             teacherClassHeadInfo.setBishopTeacherId(bishopTeacher.getId());
             teacherClassHeadInfo.setBishopTeacher(bishopTeacher.getUserName());
         }
-        ClassGroupTeacherMapper teachingTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(classGroupId, TeachTypeEnum.TEACHING);
-        if (Objects.nonNull(teachingTeacher)) {
-            teacherClassHeadInfo.setTeachingTeacherId(teachingTeacher.getId());
-            teacherClassHeadInfo.setTeachingTeacher(teachingTeacher.getUserName());
-        }
+
+        String name = classGroupTeacherMapperDao.queryTeachingNames(classGroupId);
+        teacherClassHeadInfo.setTeachingTeacher(name);
+
+//        ClassGroupTeacherMapper teachingTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(classGroupId, TeachTypeEnum.TEACHING);
+//        if (Objects.nonNull(teachingTeacher)) {
+//            teacherClassHeadInfo.setTeachingTeacherId(teachingTeacher.getId());
+//            teacherClassHeadInfo.setTeachingTeacher(teachingTeacher.getUserName());
+//        }
 
         if (classGroup.getType() == ClassGroupTypeEnum.VIP) {
             String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(classGroupId);

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

@@ -143,6 +143,11 @@
             #{item.classGroupId}
         </foreach>
     </select>
+    <select id="queryTeachingNames" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(su.real_name_) FROM class_group_teacher_mapper cgtm
+        LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
+        WHERE cgtm.teacher_role_ = 'TEACHING' AND cgtm.class_group_id_ = #{classGroupId}
+    </select>
 
     <!-- 删除对应班级老师关联关系 -->
     <delete id="delClassGroupTeacherMapper">

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

@@ -1093,7 +1093,7 @@
             cs.leave_student_num_,
             cs.class_date_,
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_ AND csts.teacher_role_='BISHOP'