Merge remote-tracking branch 'origin/master'

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

@@ -12,4 +12,6 @@ import java.util.List;
 public interface CourseScheduleEvaluateDao extends BaseDAO<Long, CourseScheduleEvaluate> {
 
     CourseScheduleEvaluate findByClassGroupId(@Param("classGroupId") Integer classGroupId);
+
+    List<CourseScheduleEvaluate> findByClassGroupIds(@Param("classGroupIds") List<Integer> classGroupIds);
 }

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

@@ -161,7 +161,7 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @param courseScheduleId
 	 * @return
 	 */
-	List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
+	List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId);
 
 	/**
 	 * @param courseScheduleIds: 课程编号列表

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

@@ -72,76 +72,78 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 查询分部所有老师
+     *
      * @param userIds
      * @return
      */
     List<TeacherBasicDto> findTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @param userIds:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      * @describe
      * @author Joburgess
      * @date 2020/2/10
-     * @param userIds:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      */
     List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @param organId:   分部编号
+     * @param subjectId: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 获取指定声部和分部下的全职老师
      * @author Joburgess
      * @date 2020/2/2
-     * @param organId: 分部编号
-     * @param subjectId: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<TeacherBasicDto> findTeaTeachersByOrganAndSubject(@Param("organId") Integer organId,
                                                            @Param("subjectId") Integer subjectId);
 
 
     /**
+     * @param organId:   分部编号
+     * @param subjectId: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 获取指定声部和分部下的全职老师
      * @author Joburgess
      * @date 2020/2/2
-     * @param organId: 分部编号
-     * @param subjectId: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<ExtendTeacherBasicDto> findTeaTeachersByOrganAndSubject1(@Param("organId") Integer organId,
                                                                   @Param("subjectId") Integer subjectId);
 
     /**
+     * @param organId:   分部编号
+     * @param subjectId: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 获取指定声部和分部下的全职老师--付费
      * @author Joburgess
      * @date 2020/2/2
-     * @param organId: 分部编号
-     * @param subjectId: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<ExtendTeacherBasicDto> findTeaTeachersByOrganAndSubject2(@Param("organId") Integer organId,
                                                                   @Param("subjectId") Integer subjectId);
 
     /**
+     * @param organIds:   部门编号列表
+     * @param subjectIds: 声部编号列表
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      * @describe 根据部门和声部获取教师列表
      * @author Joburgess
      * @date 2019/12/24
-     * @param organIds: 部门编号列表
-     * @param subjectIds: 声部编号列表
-     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherBasicDto>
      */
     List<TeacherBasicDto> findTeacherByOrganAndSubject(@Param("organIds") String organIds,
                                                        @Param("subjectIds") String subjectIds);
 
     /**
+     * @param teacherId:
+     * @return com.ym.mec.biz.dal.dto.TeacherBasicDto
      * @describe 获取教师
      * @author Joburgess
      * @date 2019/12/26
-     * @param teacherId:
-     * @return com.ym.mec.biz.dal.dto.TeacherBasicDto
      */
-    TeacherBasicDto findByTeacherId(@Param("teacherId")Integer teacherId);
+    TeacherBasicDto findByTeacherId(@Param("teacherId") Integer teacherId);
 
     /**
      * count上课结算列表
+     *
      * @param params
      * @return
      */
@@ -149,23 +151,25 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取教师上课结算列表
+     *
      * @param params
      * @return
      */
     List<TeacherCloseDto> queryCloses(Map<String, Object> params);
 
     /**
+     * @param musicGroupId: 乐团编号
+     * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
      * @describe 获取指定乐团下的所有老师
      * @author Joburgess
      * @date 2019/10/19
-     * @param musicGroupId: 乐团编号
-     * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
      */
     List<BasicUserDto> findTeacherByMusicGroup(String musicGroupId);
 
 
     /**
      * 获取教师未结算课酬综合
+     *
      * @param teacherId
      * @return
      */
@@ -173,6 +177,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取乐团详情老师列表
+     *
      * @param params
      * @return
      */
@@ -180,6 +185,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * Count乐团详情老师列表
+     *
      * @param params
      * @return
      */
@@ -187,13 +193,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 根据教师编号列表，和班级编号列表获取教师签到次数
+     *
      * @param teacherIdStr
      * @return
      */
-    List<Map<Integer, Integer>> findSignNum(@Param("teacherIdStr") String teacherIdStr,@Param("musicGroupId") String musicGroupId);
+    List<Map<Integer, Integer>> findSignNum(@Param("teacherIdStr") String teacherIdStr, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取教师乐团上课记录（乐团管理--乐团详情）
+     *
      * @param params
      * @return
      */
@@ -201,6 +209,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * COUNT教师乐团上课记录（乐团管理--乐团详情）
+     *
      * @param params
      * @return
      */
@@ -208,6 +217,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取乐团学员报名列表
+     *
      * @param params
      * @return
      */
@@ -215,6 +225,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * COUNT乐团学员报名列表
+     *
      * @param params
      * @return
      */
@@ -222,65 +233,70 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取老师的群组基本信息
+     *
      * @param teacherIds
      * @param search
      * @return
      */
-    List<BasicUserDto> queryMusicGroupStudents(@Param("teacherIds") String teacherIds,@Param("search") String search);
+    List<BasicUserDto> queryMusicGroupStudents(@Param("teacherIds") String teacherIds, @Param("search") String search);
 
     /**
+     * @param subjectId: 声部编号
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      * @describe 根据声部获取部门下的老师
      * @author Joburgess
      * @date 2019/11/4
-     * @param subjectId: 声部编号
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<Teacher> findOrganTeacherBySubject(@Param("subjectId") Integer subjectId);
 
     /**
      * 根据分部查询老师数
+     *
      * @param organId
      * @return
      */
-    Map<String,Integer> queryOrganTeacherNum(@Param("organId") String organId);
+    Map<String, Integer> queryOrganTeacherNum(@Param("organId") String organId);
 
     List<Teacher> findByFlowOrganRange(Map<String, Object> params);
 
     /**
+     * @param teacherIds: 教师编号里列表
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      * @describe 根据教师编号获取教师信息
      * @author Joburgess
      * @date 2019/12/10
-     * @param teacherIds: 教师编号里列表
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<Teacher> findByTeacherIds(@Param("teacherIds") List<Integer> teacherIds);
 
     /**
      * 获取分部下的老师列表
+     *
      * @param organId
      * @param subjectIds
      * @return
      */
-    List<Teacher> findTeacherByOrganId(@Param("organId")String organId,@Param("subjectIds")String subjectIds,@Param("jobNature")String jobNature);
+    List<Teacher> findTeacherByOrganId(@Param("organId") String organId, @Param("subjectIds") String subjectIds, @Param("jobNature") String jobNature);
 
     /**
      * 获取用户username
+     *
      * @param userIds
      * @return
      */
     List<Map<Integer, String>> queryUsernameByIds(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @param params: 搜索参数
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      * @describe 教师搜索
      * @author Joburgess
      * @date 2020/1/7
-     * @param params: 搜索参数
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<TeacherBasicDto> searchTeachers(Map<String, Object> params);
 
     /**
      * 获取教师列表
+     *
      * @param params
      * @return
      */
@@ -290,6 +306,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取教师布置的作业
+     *
      * @param courseScheduleId
      * @return
      */
@@ -299,6 +316,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取user
+     *
      * @param userId
      * @return
      */
@@ -306,13 +324,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取教师基本信息
+     *
      * @param teacherId
      * @return
      */
-    List<BasicUserDto> queryTeacherBaseInfo(@Param("teacherId")Set<Integer> teacherId);
+    List<BasicUserDto> queryTeacherBaseInfo(@Param("teacherId") Set<Integer> teacherId);
 
     /**
      * 获取教师immodel
+     *
      * @param teacherIds
      * @return
      */
@@ -320,6 +340,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取和学员相关的乐团老师列表
+     *
      * @param studentId
      * @return
      */
@@ -327,6 +348,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取和学员相关的VIP老师列表
+     *
      * @param studentId
      * @return
      */
@@ -334,8 +356,16 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 获取和学员相关的陪练课老师列表
+     *
      * @param studentId
      * @return
      */
     Set<Integer> findPracticeTeacherIds(Integer studentId);
+
+    /**
+     * 获取教师基本信息
+     * @param id
+     * @return
+     */
+    BasicUserDto findTeacherInfo(Integer id);
 }

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

@@ -83,6 +83,9 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "陪练报告URL")
     private String studyReportUrl;
 
+    @ApiModelProperty(value = "是否已有报告")
+    private Boolean hasReport;
+
     public Date getCourseStartDate() {
         return courseStartDate;
     }
@@ -274,4 +277,12 @@ public class TeacherClassGroupDto {
     public void setStudyReportUrl(String studyReportUrl) {
         this.studyReportUrl = studyReportUrl;
     }
+
+    public Boolean getHasReport() {
+        return hasReport;
+    }
+
+    public void setHasReport(Boolean hasReport) {
+        this.hasReport = hasReport;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -24,6 +26,17 @@ public class CourseScheduleEvaluate {
 
     private Date createTime;
 
+    private Integer studentId;
+
+    @ApiModelProperty(value = "学生专业")
+    private String subjectName;
+
+    @ApiModelProperty(value = "学生信息")
+    private SysUser student;
+
+    @ApiModelProperty(value = "老师信息")
+    private BasicUserDto teacher;
+
     public Long getId() {
         return id;
     }
@@ -87,4 +100,36 @@ public class CourseScheduleEvaluate {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public BasicUserDto getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(BasicUserDto teacher) {
+        this.teacher = teacher;
+    }
+
+    public SysUser getStudent() {
+        return student;
+    }
+
+    public void setStudent(SysUser student) {
+        this.student = student;
+    }
 }

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

@@ -32,10 +32,20 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private Boolean isMake;
 
+    private Boolean isExport;
+
     private Boolean hasCourse;
 
     private Boolean hasPracticeCourse;
 
+    public Boolean getIsExport() {
+        return isExport;
+    }
+
+    public void setIsExport(Boolean export) {
+        isExport = export;
+    }
+
     public Boolean getHasPracticeCourse() {
         return hasPracticeCourse;
     }

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

@@ -11,4 +11,6 @@ public interface CourseScheduleEvaluateService extends BaseService<Long, CourseS
 
     boolean addStudyReport(CourseScheduleEvaluate courseScheduleEvaluate);
 
+    CourseScheduleEvaluate getStudyReport(Integer classGroupId);
+
 }

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

@@ -7,10 +7,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.ym.mec.biz.dal.dto.*;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
+import com.ym.mec.biz.dal.dto.MusicCardDto;
+import com.ym.mec.biz.dal.dto.RegisterPayDto;
+import com.ym.mec.biz.dal.dto.SporadicPayDto;
+import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
+import com.ym.mec.biz.dal.dto.UpdateExpectedNumDto;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
@@ -186,7 +189,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param courseScheduleId
 	 * @return
 	 */
-	List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
+	List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId);
 
 	/**
 	 * 开启缴费（报名中 -->  缴费中）

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

@@ -158,7 +158,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String TEACHER_STUDY_REPORT_URL = "teacher_study_report_url";
 
     /**
-     * 陪练课学生地址
+     * 陪练课报告地址
      */
     String STUDENT_STUDY_REPORT_URL = "student_study_report_url";
 

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

@@ -106,6 +106,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private SubjectDao subjectDao;
     @Autowired
     private GroupDao groupDao;
+    @Autowired
+    private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -975,7 +977,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             //剩余课程为显示陪练报告入口rul
             if(teacherClassGroupDto.getType() == ClassGroupTypeEnum.PRACTICE){
-               if(classGroupNoStartClassTimes.intValue()==0 && classGroupTeacherMap.get(teacherClassGroupDto.getClassGroupId().intValue()).equals(user.getId())){
+                List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateDao.findByClassGroupIds(classGroupIds);
+                Map<Integer, Long> reportMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId, CourseScheduleEvaluate::getId));
+                if(reportMap.containsKey(teacherClassGroupDto.getClassGroupId().intValue())){
+                    teacherClassGroupDto.setHasReport(true);
+                    String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_STUDY_REPORT_URL);
+                    teacherClassGroupDto.setStudyReportUrl(studyReportUrl+teacherClassGroupDto.getClassGroupId());
+                }else if(classGroupNoStartClassTimes.intValue()==0 && classGroupTeacherMap.get(teacherClassGroupDto.getClassGroupId().intValue()).equals(user.getId())){
                    String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_STUDY_REPORT_URL);
                    teacherClassGroupDto.setStudyReportUrl(studyReportUrl+teacherClassGroupDto.getClassGroupId());
                }

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.service.impl;
 
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.CourseScheduleEvaluateDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.CourseScheduleEvaluate;
 import com.ym.mec.biz.service.CourseScheduleEvaluateService;
@@ -13,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
 
 @Service
 public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, CourseScheduleEvaluate> implements CourseScheduleEvaluateService {
@@ -21,6 +26,8 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
     private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
     @Autowired
     private ClassGroupDao classGroupDao;
+    @Autowired
+    private TeacherDao teacherDao;
 
     @Override
     public BaseDAO<Long, CourseScheduleEvaluate> getDAO() {
@@ -31,19 +38,34 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
     @Override
     public boolean addStudyReport(CourseScheduleEvaluate courseScheduleEvaluate) {
         ClassGroup classGroup = classGroupDao.get(courseScheduleEvaluate.getClassGroupId());
-        if(classGroup==null){
-           throw new BizException("课程不存在！");
+        if (classGroup == null) {
+            throw new BizException("课程不存在！");
         }
         CourseScheduleEvaluate hasOne = courseScheduleEvaluateDao.findByClassGroupId(courseScheduleEvaluate.getClassGroupId());
-        if(hasOne != null){
+        if (hasOne != null) {
             throw new BizException("报告已添加，请勿重复提交");
         }
         courseScheduleEvaluate.setMusicGroupId(classGroup.getMusicGroupId());
         courseScheduleEvaluate.setCreateTime(new Date());
         long num = courseScheduleEvaluateDao.insert(courseScheduleEvaluate);
-        if(num <= 0){
+        if (num <= 0) {
             throw new BizException("报告添加失败，请重试");
         }
         return true;
     }
+
+    @Override
+    public CourseScheduleEvaluate getStudyReport(Integer classGroupId) {
+        CourseScheduleEvaluate studyReport = courseScheduleEvaluateDao.findByClassGroupId(classGroupId);
+        if (studyReport == null) {
+            throw new BizException("报告不存在");
+        }
+        SysUser user = teacherDao.getUser(studyReport.getStudentId());
+        BasicUserDto teacherInfo = teacherDao.findTeacherInfo(studyReport.getTeacherId());
+
+        studyReport.setStudent(user);
+        studyReport.setTeacher(teacherInfo);
+        return studyReport;
+
+    }
 }

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

@@ -25,7 +25,9 @@ import com.ym.mec.util.collection.ListUtil;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.json.JsonUtil;
+
 import feign.codec.DecodeException;
+
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -1633,19 +1635,27 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (Objects.isNull(newCourseSchedule.getGroupType())) {
                 newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());
             }
+
+            if (Objects.isNull(newCourseSchedule.getTeachMode())) {
+                newCourseSchedule.setTeachMode(oldCourseSchedule.getTeachMode());
+            }
             
 			if (newCourseSchedule.getGroupType() == GroupType.VIP) {
 				if (newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() && newCourseSchedule.getTeachMode() == TeachModeEnum.OFFLINE) {
 					throw new BizException("不允许将线上课调整为线下课");
 				}
 			}
+
+            if (Objects.isNull(newCourseSchedule.getSchoolId())) {
+                newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
+            }
+			if (newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() && newCourseSchedule.getTeachMode() == TeachModeEnum.ONLINE) {
+				newCourseSchedule.setSchoolId(-1);
+			}
 			
             if (Objects.isNull(newCourseSchedule.getActualTeacherId())) {
                 newCourseSchedule.setActualTeacherId(oldCourseSchedule.getActualTeacherId());
             }
-            if (Objects.isNull(newCourseSchedule.getSchoolId())) {
-                newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
-            }
             if (Objects.isNull(newCourseSchedule.getType())) {
                 newCourseSchedule.setType(oldCourseSchedule.getType());
             }
@@ -1659,9 +1669,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if(Objects.isNull(newCourseSchedule.getClassGroupId())){
                 newCourseSchedule.setClassGroupId(oldCourseSchedule.getClassGroupId());
             }
-            if (Objects.isNull(newCourseSchedule.getTeachMode())) {
-                newCourseSchedule.setTeachMode(oldCourseSchedule.getTeachMode());
-            }
             if(Objects.isNull(newCourseSchedule.getClassDate())){
                 newCourseSchedule.setClassDate(oldCourseSchedule.getClassDate());
             }
@@ -1705,6 +1712,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		// 课程对应乐团结算方式集合
 		List<Map<String, String>> musicGroupSettlementTypeByCourse = courseScheduleTeacherSalaryDao.findMusicGroupSettlementTypeByCourse(courseScheduleIds);
 		Map<String, String> musicGroupSettlementsMap = MapUtil.convertMybatisMap(musicGroupSettlementTypeByCourse);
+		
+		Map<Long,Map<Integer,CourseScheduleTeacherSalary>> courseScheduleTeacherSalaryMap = new HashMap<Long, Map<Integer,CourseScheduleTeacherSalary>>();
+		List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseScheduleIds);
+		
+		for (CourseScheduleTeacherSalary ts : courseScheduleTeacherSalaryList) {
+			Map<Integer, CourseScheduleTeacherSalary> map = courseScheduleTeacherSalaryMap.get(ts.getCourseScheduleId());
+			if (map == null) {
+				map = new HashMap<Integer, CourseScheduleTeacherSalary>();
+			}
+			map.put(ts.getUserId(), ts);
+			courseScheduleTeacherSalaryMap.put(ts.getCourseScheduleId(), map);
+		}
 
 		Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(), "yyyy-MM-dd");
 
@@ -1781,24 +1800,31 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if (!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList) || newCourseSchedule.getType() != oldCourseSchedule.getType()
 					|| newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
 
-				// 所有教师列表
-				List<Teacher> teachers = teacherDao.findByTeacherIds(newTeacherIdList);
-				Map<Integer, Teacher> teacherMap = teachers.stream().collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
-
+				Map<Integer, Teacher> teacherMap = null;
 				Map<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>> musicGroupSalaryMap = new HashMap<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>>();
-				// 所有老师默认乐团课酬
-				List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaries = teacherDefaultMusicGroupSalaryDao.findByTeacher(newTeacherIdList);
-				for (TeacherDefaultMusicGroupSalary tdms : teacherDefaultMusicGroupSalaries) {
-					Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> map = musicGroupSalaryMap.get(tdms.getUserId());
-					if (map == null) {
-						map = new HashMap<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary>();
+
+				if (newCourseSchedule.getGroupType() == GroupType.MUSIC) {
+					// 所有教师列表
+					List<Teacher> teachers = teacherDao.findByTeacherIds(newTeacherIdList);
+					teacherMap = teachers.stream().collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
+
+					// 所有老师默认乐团课酬
+					List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaries = teacherDefaultMusicGroupSalaryDao.findByTeacher(newTeacherIdList);
+					for (TeacherDefaultMusicGroupSalary tdms : teacherDefaultMusicGroupSalaries) {
+						Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> map = musicGroupSalaryMap.get(tdms.getUserId());
+						if (map == null) {
+							map = new HashMap<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary>();
+						}
+						map.put(tdms.getCourseScheduleType(), tdms);
+						musicGroupSalaryMap.put(tdms.getUserId(), map);
 					}
-					map.put(tdms.getCourseScheduleType(), tdms);
-					musicGroupSalaryMap.put(tdms.getUserId(), map);
+				} else if (newCourseSchedule.getGroupType() == GroupType.VIP) {
+					//查询这节课每位老师对应的课酬
+					courseScheduleTeacherSalaryDao.queryTeacherSalary(courseScheduleId);
 				}
 
 				// 所有老师默认vip课酬
-				List<TeacherDefaultVipGroupSalary> teacherDefaultVipGroupSalaries = teacherDefaultVipGroupSalaryDao.queryByUserIdList(newTeacherIdList);
+				/*List<TeacherDefaultVipGroupSalary> teacherDefaultVipGroupSalaries = teacherDefaultVipGroupSalaryDao.queryByUserIdList(newTeacherIdList);
 				Map<Integer, Map<Integer, TeacherDefaultVipGroupSalary>> vipGroupSalaryMap = new HashMap<Integer, Map<Integer, TeacherDefaultVipGroupSalary>>();
 				for (TeacherDefaultVipGroupSalary tdvs : teacherDefaultVipGroupSalaries) {
 					Map<Integer, TeacherDefaultVipGroupSalary> map = vipGroupSalaryMap.get(tdvs.getUserId());
@@ -1809,7 +1835,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					vipGroupSalaryMap.put(tdvs.getUserId(), map);
 				}
 
-				VipGroup vipGroup = vipGroupDao.findByCourseSchedule(courseScheduleId);
+				VipGroup vipGroup = vipGroupDao.findByCourseSchedule(courseScheduleId);*/
 
 				// 删除课酬
 				List<Long> courseScheduleIdList = new ArrayList<Long>();
@@ -1880,7 +1906,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						}
 					
 					} else if (newCourseSchedule.getGroupType() == GroupType.VIP) {
-						Map<Integer, TeacherDefaultVipGroupSalary> map = vipGroupSalaryMap.get(teacherId);
+						/*Map<Integer, TeacherDefaultVipGroupSalary> map = vipGroupSalaryMap.get(teacherId);
 						if (map == null) {
 							throw new BizException("老师[]没有设置默认课酬，请先设置", teacherId);
 						}
@@ -1895,6 +1921,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							ts.setExpectSalary(tdvs.getOfflineClassesSalary());
 						} else {
 							ts.setExpectSalary(tdvs.getOnlineClassesSalary());
+						}*/
+
+						ts.setExpectSalary(new BigDecimal(0));
+						Map<Integer, CourseScheduleTeacherSalary> tsMap = courseScheduleTeacherSalaryMap.get(courseScheduleId);
+						if(tsMap != null){
+							CourseScheduleTeacherSalary oldTS = tsMap.get(teacherId);
+							if(oldTS != null){
+								ts.setExpectSalary(oldTS.getExpectSalary());
+							}
 						}
 					} else if (newCourseSchedule.getGroupType() == GroupType.PRACTICE) {
 						List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao

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

@@ -2007,7 +2007,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId) {
+    public List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId) {
         return courseScheduleTeacherSalaryDao.queryTeacherSalary(courseScheduleId);
     }
 

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

@@ -99,18 +99,21 @@ public class StudentManageServiceImpl implements StudentManageService {
         }else {
             count = studentManageDao.countStudentByOrganId(params);
         }
+        if(queryInfo.getIsExport() && count > 50000){
+            throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
+        }
         List<StudentManageListDto> dataList = null;
         if (count > 0) {
             pageInfo.setTotal(count);
             dataList = studentManageDao.findStudentsByOrganId(params);
             Set<Integer> userIds = dataList.stream().map(StudentManageListDto::getUserId).collect(Collectors.toSet());
-//            Set<Integer> organIds = dataList.stream().map(StudentManageListDto::getOrganId).collect(Collectors.toSet());
+            Set<Integer> organIds = dataList.stream().map(StudentManageListDto::getOrganId).collect(Collectors.toSet());
             List<SysUserCashAccount> byUserIds = sysUserCashAccountDao.findByUserIds(userIds);
             Map<Integer, SysUserCashAccount> collect = byUserIds.stream()
                     .collect(Collectors.toMap(SysUserCashAccount::getUserId, sysUserCashAccount -> sysUserCashAccount));
             Map<Integer,Integer> hasPracticeCourseMap = MapUtil.convertIntegerMap(studentManageDao.getHasPracticeCourse(userIds));
             //获取用户分部
-            /*Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
+            Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
             //获取所在乐团
             Map<Integer,String> musicGroupNames = MapUtil.convertMybatisMap(musicGroupDao.queryUserMusicNames(userIds));
             //获取所在vip
@@ -120,9 +123,9 @@ public class StudentManageServiceImpl implements StudentManageService {
             //获取所在vip状态
             Map<Integer,String> vipGroupStatus = MapUtil.convertMybatisMap(vipGroupDao.queryUserVipStatus(userIds));
             //获取所在声部
-            Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds));*/
+            Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds));
             dataList.forEach(e -> {
-                /*e.setOrganName(organNames.get(e.getOrganId()));
+                e.setOrganName(organNames.get(e.getOrganId()));
                 e.setMusicGroupName(musicGroupNames.get(e.getUserId()));
                 e.setVipGroupName(vipGroupNames.get(e.getUserId()));
                 e.setSubjectName(subjectNames.get(e.getUserId()));
@@ -139,7 +142,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                     for (int i = 0;i < split.length;i++){
                         e.setVipGroupStatus(ClassGroupStudentStatusEnum.valueOf(split[i]).getMsg()+" ");
                     }
-                }*/
+                }
                 if(hasCourse == null){
                     Integer course = studentManageDao.getHasCourse(e.getUserId());
                     e.setHasCourse(course==null?YesOrNoEnum.NO:course==0?YesOrNoEnum.NO:YesOrNoEnum.YES);

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

@@ -2,26 +2,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ym.mec.biz.dal.dao.CourseScheduleEvaluateDao">
     <resultMap id="CourseScheduleEvaluate" type="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate">
-        <id column="id_" jdbcType="BIGINT" property="id" />
-        <result column="music_group_id_" jdbcType="VARCHAR" property="musicGroupId" />
-        <result column="class_group_id_" jdbcType="INTEGER" property="classGroupId" />
-        <result column="course_schedule_id_" jdbcType="BIGINT" property="courseScheduleId" />
-        <result column="teacher_id_" jdbcType="INTEGER" property="teacherId" />
-        <result column="item_" jdbcType="VARCHAR" property="item" />
-        <result column="comment_" jdbcType="LONGVARCHAR" property="comment" />
-        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+        <id column="id_" jdbcType="BIGINT" property="id"/>
+        <result column="music_group_id_" jdbcType="VARCHAR" property="musicGroupId"/>
+        <result column="class_group_id_" jdbcType="INTEGER" property="classGroupId"/>
+        <result column="course_schedule_id_" jdbcType="BIGINT" property="courseScheduleId"/>
+        <result column="teacher_id_" jdbcType="INTEGER" property="teacherId"/>
+        <result column="item_" jdbcType="VARCHAR" property="item"/>
+        <result column="comment_" jdbcType="LONGVARCHAR" property="comment"/>
+        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="student_id_" jdbcType="INTEGER" property="studentId"/>
+        <result column="subject_name_" jdbcType="VARCHAR" property="subjectName"/>
     </resultMap>
     <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_,
-        teacher_id_, item_, comment_,
-        create_time_)
+                                              teacher_id_, item_, comment_,
+                                              create_time_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{classGroupId,jdbcType=INTEGER}, #{courseScheduleId,jdbcType=BIGINT},
-        #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR},
-        #{createTime,jdbcType=TIMESTAMP})
+                #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR},
+                #{createTime,jdbcType=TIMESTAMP})
     </insert>
 
     <select id="findByClassGroupId" resultMap="CourseScheduleEvaluate">
-        SELECT * FROM course_schedule_evaluate WHERE class_group_id_ = #{classGroupId}
+        SELECT cse.*, s.name_ subject_name_, pg.student_id_
+        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}
+    </select>
+
+    <select id="findByClassGroupIds" resultMap="CourseScheduleEvaluate">
+        SELECT * FROM course_schedule_evaluate WHERE class_group_id_ IN
+        <foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
+            #{classGroupId}
+        </foreach>
     </select>
 </mapper>

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

@@ -1072,9 +1072,7 @@
                 <if test="item.leaveStudentNum != null">
                     leave_student_num_ = #{item.leaveStudentNum},
                 </if>
-                <if test="item.schoolId != null">
                     schoole_id_ = #{item.schoolId},
-                </if>
                 <if test="item.schoolId == null">
                     schoole_id_ = null,
                 </if>

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

@@ -706,8 +706,9 @@
         <result property="vipGroupName" column="vip_group_name_"/>
         <result property="vipGroupStatus" column="vip_group_status_"/>
         <result property="organName" column="organ_name_"/>
+        <result property="organId" column="organ_id_"/>
         <result property="subjectName" column="music_group_subject_"/>
-        <result property="courseBalance" column="balance_"/>
+        <result property="courseBalance" column="course_balance_"/>
     </resultMap>
     <select id="queryHasCourseStudent" resultMap="studentManageListDto">
         SELECT su.id_ user_id_,su.username_,su.gender_,GROUP_CONCAT(DISTINCT sr.parents_name_)parents_name_,
@@ -728,7 +729,7 @@
         CASE WHEN GROUP_CONCAT(DISTINCT pla.id_) IS NULL THEN 0 ELSE 1 END isMake_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
         CASE WHEN GROUP_CONCAT(DISTINCT cssp1.id_) IS NULL THEN 0 ELSE 1 END hasPracticeCourse_,
-        suca.balance_
+        suca.course_balance_
         FROM sys_user su
         LEFT JOIN course_schedule_student_payment cssp ON su.id_ = cssp.user_id_
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_ AND cs.status_ != 'OVER'

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

@@ -824,4 +824,17 @@
         LEFT JOIN practice_group pg ON pg.id_ = cgsm.music_group_id_
         WHERE cgsm.group_type_ = 'PRACTICE' AND cgsm.user_id_ = #{studentId}
     </select>
+
+    <select id="findTeacherInfo"  resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT
+        su.real_name_ username_,
+        su.id_ user_id_,
+        su.avatar_ head_url_,
+        gender_,
+        GROUP_CONCAT(s.name_) subject_name_
+        FROM sys_user su
+        LEFT JOIN teacher t ON su.id_ = t.id_
+        LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
+        WHERE su.id_ = #{id}
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudyReportController.java

@@ -0,0 +1,26 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.service.CourseScheduleEvaluateService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("studyReport")
+@Api(tags = "陪练报告")
+@RestController
+public class StudyReportController extends BaseController {
+
+	@Autowired
+	private CourseScheduleEvaluateService courseScheduleEvaluateService;
+
+
+	@ApiOperation("获取学生陪练报告信息")
+	@GetMapping(value = "info")
+	public Object info(Integer classGroupId) {
+		return succeed(courseScheduleEvaluateService.getStudyReport(classGroupId));
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.service.CourseScheduleEvaluateService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("studyReport")
+@Api(tags = "陪练报告")
+@RestController
+public class StudyReportController extends BaseController {
+
+	@Autowired
+	private CourseScheduleEvaluateService courseScheduleEvaluateService;
+
+
+	@ApiOperation("获取学生陪练报告信息")
+	@GetMapping(value = "info")
+	public Object info(Integer classGroupId) {
+		return succeed(courseScheduleEvaluateService.getStudyReport(classGroupId));
+	}
+}

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

@@ -216,7 +216,7 @@ public class CourseScheduleController extends BaseController {
 	@ApiOperation(value = "乐团详情--课酬调整--课程教师列表")
 	@GetMapping("/queryTeacherSalary")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/queryTeacherSalary')")
-	public Object queryTeacherSalary(Integer courseScheduleId) {
+	public Object queryTeacherSalary(Long courseScheduleId) {
 		return succeed(musicGroupService.queryTeacherSalary(courseScheduleId));
 	}
 

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

@@ -52,6 +52,7 @@ public class StudentManageController extends BaseController {
     @PostMapping("export/studentHasCourse")
     @PreAuthorize("@pcs.hasPermissions('export/studentHasCourse')")
     public void studentHasCourse(HttpServletResponse response, StudentManageQueryInfo queryInfo) {
+        queryInfo.setRows(99999);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -69,10 +70,9 @@ public class StudentManageController extends BaseController {
                 }
             }
         }
-        List<StudentManageListDto> rows = studentManageService.queryHasCourseStudent(queryInfo);
-        if(rows.size() > 50000){
-            throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
-        }
+        queryInfo.setIsExport(true);
+//        List<StudentManageListDto> rows = studentManageService.queryHasCourseStudent(queryInfo);
+        List<StudentManageListDto> rows = studentManageService.findStudentsByOrganId(queryInfo).getRows();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
                     "家长联系电话", "是否激活", "是否有课", "是否预约陪练课","是否有陪练课", "课程余额(元)",
@@ -111,6 +111,7 @@ public class StudentManageController extends BaseController {
                 }
             }
         }
+        queryInfo.setIsExport(false);
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
 

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

@@ -21,7 +21,7 @@ import java.util.List;
 
 
 @RequestMapping("teacherCourseStatistics")
-@Api(tags = "教师服务")
+@Api(tags = "教师排课统计服务")
 @RestController
 public class TeacherCourseStatisticsController extends BaseController {