Merge branch 'zx_2022-11-14' of http://git.dayaedu.com/yonge/mec into master_saas

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -123,8 +123,6 @@ public class SysUser extends BaseEntity implements Serializable{
 
 	private Integer operatingTag;
 
-	private Integer teacherId;
-
 	@ApiModelProperty(value = "用户角色",required = false)
 	private List<Integer> roles;
 
@@ -422,14 +420,6 @@ public class SysUser extends BaseEntity implements Serializable{
 		this.isSuperAdmin = isSuperAdmin;
 	}
 
-	public Integer getTeacherId() {
-		return teacherId;
-	}
-
-	public void setTeacherId(Integer teacherId) {
-		this.teacherId = teacherId;
-	}
-
 	public List<Integer> getRoles() {
 		return roles;
 	}

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

@@ -5,7 +5,6 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.IndexBaseMonthData;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.enums.GroupType;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -35,30 +34,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     int batchUpdate(@Param("studentList") List<Student> studentList);
 
-    /**
-     * 查询运营学生列表
-     *
-     * @param params
-     * @return
-     */
-    List<Student4operating> getOperatingStudents(Map<String, Object> params);
-
-    /**
-     * 查询运营学生总数
-     *
-     * @param params
-     * @return
-     */
-    Integer countOperatingStudents(Map<String, Object> params);
-
-    /**
-     * 批量获取老师体验学生数
-     *
-     * @param teacherIds
-     * @return
-     */
-    List<Map<Integer, Integer>> getTeacherOperatingStudentsNum(@Param("teacherIds") String teacherIds);
-
     List<String> getStudentNames(@Param("studentIds") List<Integer> studentIds);
 
     List<SimpleUserDto> getStudentsWithOrgan(Map<String, Object> params);
@@ -66,30 +41,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     int countStudentsWithOrgan(Map<String, Object> params);
 
     /**
-     * 根据类型批量获取老师转化
-     *
-     * @param teacherIds
-     * @param groupType
-     * @return
-     */
-    List<Map<Integer, Integer>> getBuyNums(@Param("teacherId") String teacherId, @Param("groupType") GroupType groupType);
-
-    /**
-     * 根据同事存在vip和网管的转化
-     *
-     * @param teacherIds
-     * @return
-     */
-    List<Map<Integer, Integer>> getPracticeAndVipNums(@Param("teacherIds") String teacherIds);
-
-    /**
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Student>
-     * @describe 获取服务学员列表
-     * @author Joburgess
-     * @date 2020.04.29
-     */
-
-    /**
      * @return java.util.List<java.lang.Integer>
      * @describe 获取被服务学员id列表
      * @author Joburgess
@@ -131,14 +82,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
                                 @Param("serviceTag") Integer serviceTag);
 
     /**
-     * 修改学员的指导老师
-     *
-     * @param teacherId
-     */
-    void batchUpdateAdviser(@Param("teacherId") Integer teacherId, @Param("studentIds") String studentIds);
-
-
-    /**
      * 当前服务指标已开启，但在系统中没有剩余课时，且在乐团中不是在读状态，这种用户需要关闭服务指标
      * @return
      */

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

@@ -393,15 +393,6 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      */
     List<OrderStatisDto> getOrganNormalStudent(Integer tenantId);
 
-    /**
-     * @param userIds:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.UserGroupDto>
-     * @describe 获取学员关联乐团记录
-     * @author qnc99
-     * @date 2020/11/24 0024
-     */
-    List<UserGroupDto> getUserGroups(@Param("userIds") List<Integer> userIds);
-
 
     /**
      * 获取乐团未交费的学生

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

@@ -2,8 +2,28 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.StudentTeacherMapper;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface StudentTeacherMapperDao extends BaseDAO<Integer, StudentTeacherMapper> {
 
-	
+
+    /**
+    * @description: 获取学员关联的所有老师
+     * @param studentId
+    * @return java.util.List<java.lang.Integer>
+    * @author zx
+    * @date 2022/11/15 10:33
+    */
+    List<Integer> queryTeacherIds(@Param("studentId") Integer studentId, @Param("teacherType") String teacherType);
+
+    /**
+    * @description: 获取老师关联的学员列表
+     * @param teacherId
+    * @return java.util.List<java.lang.Integer>
+    * @author zx
+    * @date 2022/11/15 15:02
+    */
+    List<Integer> queryStudentIds(@Param("teacherId") Integer teacherId, @Param("teacherType") String teacherType);
 }

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

@@ -67,6 +67,13 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
     List<CountStudentTrainDataDto> queryStudentTrain(Map<String, Object> params);
 
     /**
+     * 老师端首页学员训练统计
+     * @param params
+     * @return
+     */
+    int countStudentTrain(Map<String, Object> params);
+
+    /**
      * @describe 统计分部云教练新增人数
      * @author Joburgess
      * @date 2021/8/18 0018

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

@@ -38,11 +38,22 @@ public class BasicUserDto {
 
     private String subjectIdList;
 
+    @ApiModelProperty(value = "学员关联的老师类型：VIP、PRACTICE、MIX、NORMAL")
+    private String teacherType;
+
     private Integer tenantId;
 
     @ApiModelProperty(value = "是否需要乐器维修")
     private Boolean repairFlag = false;
 
+    public String getTeacherType() {
+        return teacherType;
+    }
+
+    public void setTeacherType(String teacherType) {
+        this.teacherType = teacherType;
+    }
+
     public Boolean getRepairFlag() {
         return repairFlag;
     }

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

@@ -11,8 +11,6 @@ public class ChildrenStatisticsDetailDto {
 
     private String currentClass;
 
-    private String realName;
-
     private String username;
 
     private String phone;
@@ -65,14 +63,6 @@ public class ChildrenStatisticsDetailDto {
         this.currentClass = currentClass;
     }
 
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
     public String getSubjectName() {
         return subjectName;
     }

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

@@ -18,8 +18,6 @@ public class CloudTeacherActiveTargetDetailDto {
 
 	private String currentGradeNum;
 
-	private String teacherName;
-
 	private String remark;
 
 	private BigDecimal amount = BigDecimal.ZERO;
@@ -90,14 +88,6 @@ public class CloudTeacherActiveTargetDetailDto {
 		this.currentGradeNum = currentGradeNum;
 	}
 
-	public String getTeacherName() {
-		return teacherName;
-	}
-
-	public void setTeacherName(String teacherName) {
-		this.teacherName = teacherName;
-	}
-
 	public String getRemark() {
 		return remark;
 	}

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

@@ -45,12 +45,6 @@ public class ExportStudentAttendanceDto {
     @ApiModelProperty(value = "上课结束时间", required = true)
     private String endClassTime;
 
-    @ApiModelProperty(value = "指导老师名称", required = true)
-    private String guideTeacherName;
-
-    @ApiModelProperty(value = "指导老师编号", required = true)
-    private Integer guideTeacherId;
-
     @ApiModelProperty(value = "教务老师编号", required = true)
     private Integer educationalTeacherId;
 
@@ -178,22 +172,6 @@ public class ExportStudentAttendanceDto {
         this.endClassTime = endClassTime;
     }
 
-    public String getGuideTeacherName() {
-        return guideTeacherName;
-    }
-
-    public void setGuideTeacherName(String guideTeacherName) {
-        this.guideTeacherName = guideTeacherName;
-    }
-
-    public Integer getGuideTeacherId() {
-        return guideTeacherId;
-    }
-
-    public void setGuideTeacherId(Integer guideTeacherId) {
-        this.guideTeacherId = guideTeacherId;
-    }
-
     public Integer getEducationalTeacherId() {
         return educationalTeacherId;
     }

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

@@ -1,15 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.auth.api.entity.SysUser;
-
 /**
  * 对应数据库表(student):
  */
@@ -36,16 +34,12 @@ public class Student extends SysUser {
 
 	private Integer operatingTempTag;
 
-	private Integer teacherId;
-	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
 
-	private String teacherName;
-
 	private Boolean isNewUser;
 
 	@ApiModelProperty(value = "关心包：0：默认不可用；1：可用；2：已使用;")
@@ -232,14 +226,6 @@ public class Student extends SysUser {
 		this.operatingTempTag = operatingTempTag;
 	}
 
-	public Integer getTeacherId() {
-		return teacherId;
-	}
-
-	public void setTeacherId(Integer teacherId) {
-		this.teacherId = teacherId;
-	}
-
 	public Integer getCarePackage() {
 		return carePackage;
 	}
@@ -261,14 +247,6 @@ public class Student extends SysUser {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-	public String getTeacherName() {
-		return teacherName;
-	}
-
-	public void setTeacherName(String teacherName) {
-		this.teacherName = teacherName;
-	}
-
 	public Integer getCurrentGradeNum() {
 		return currentGradeNum;
 	}

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

@@ -1,18 +1,16 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.ProbationPeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
-import com.ym.mec.biz.dal.enums.JobTypeEnum;
-import com.ym.mec.biz.dal.enums.ProbationPeriodEnum;
-
 /**
  * 对应数据库表(teacher):
  */
@@ -122,7 +120,6 @@ public class Teacher extends SysUser {
 	
 	private String contractUrl;
 
-	private BigDecimal operatingIndex;
 	private BigDecimal serviceIndex;
 
 	@ApiModelProperty(value = "是否结算课酬")
@@ -145,14 +142,6 @@ public class Teacher extends SysUser {
 		this.isSettlementSalary = isSettlementSalary;
 	}
 
-	public BigDecimal getOperatingIndex() {
-		return operatingIndex;
-	}
-
-	public void setOperatingIndex(BigDecimal operatingIndex) {
-		this.operatingIndex = operatingIndex;
-	}
-
 	public BigDecimal getServiceIndex() {
 		return serviceIndex;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExportEnum.java

@@ -43,7 +43,6 @@ public enum ExportEnum implements BaseEnum<String, ExportEnum> {
     EXTRA_EXERCISES_REPLYS("EXTRA_EXERCISES_REPLYS", "学生课外训练记录导出"),
     EXERCISES_SITUATIONS("EXERCISES_SITUATIONS", "课外训练-教学导出"),
     IS_SETTLEMENT_COURSE_SALARYS("IS_SETTLEMENT_COURSE_SALARYS", "教师课酬导出"),
-    OPERATING_STUDENTS("OPERATING_STUDENTS", "运营指标管理导出"),
     VIP_COURSE_REVIEWS("VIP_COURSE_REVIEWS", "VIP评论列表导出"),
     DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名导出"),
     COOPERATION_ORGAN("COOPERATION_ORGAN", "合作单位导出"),

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

@@ -10,8 +10,6 @@ public class CloudTeacherActiveQueryInfo extends QueryInfo {
 
     private Integer subjectId;
 
-    private Integer teacherId;
-
     private String remarkType;
 
     public String getOrganIds() {
@@ -38,14 +36,6 @@ public class CloudTeacherActiveQueryInfo extends QueryInfo {
         this.subjectId = subjectId;
     }
 
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
     public String getRemarkType() {
         return remarkType;
     }

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

@@ -137,15 +137,6 @@ public interface ExportService {
     List isSettlementCourseSalarys(Map<String, Object> info);
 
     /**
-    * @description: 运营指标管理导出
-     * @param info
-    * @return java.util.List
-    * @author zx
-    * @date 2022/2/10 13:33
-    */
-    List operatingStudents(Map<String, Object> info);
-
-    /**
     * @description: vip评论列表导出
      * @param info
     * @return java.util.List

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

@@ -1,13 +1,13 @@
 package com.ym.mec.biz.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.common.page.PageInfo;
+
+import java.util.List;
+import java.util.Map;
 /**
  * @Author Joburgess
  * @Date 2019/9/19
@@ -175,13 +175,6 @@ public interface StudentManageService {
     Map<String,Integer> sumStudentAttendance(Integer courseScheduleId);
 
     /**
-     * 运营指标学生
-     * @param queryInfo
-     * @return
-     */
-    PageInfo<Student4operating> getOperatingStudents(StudentOperatingQueryInfo queryInfo);
-
-    /**
      * 乐团修改--学员缴费记录--可新增学员列表
      * @param musicGroupId
      * @param musicGroupPaymentCalenderId

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

@@ -41,11 +41,6 @@ public interface StudentService extends BaseService<Integer, Student> {
      */
     void initTeacherId();
 
-    /**
-     * 修改学员的指导老师
-     * @param teacherId
-     */
-    void batchUpdateAdviser(Integer teacherId,String studentIds);
 
     /**
      * 升级学生的年级
@@ -169,13 +164,6 @@ public interface StudentService extends BaseService<Integer, Student> {
     PageInfo<SysUserDto> queryStudentBasicInfo(UserBasicQueryInfo queryInfo);
 
     /**
-     * 获取和当前指导老师关联的学员
-     *
-     * @return
-     */
-    PageInfo<BasicUserDto> queryStudent(QueryInfo queryInfo);
-
-    /**
     * @description: 获取分部学员声部列表
      * @param organIds
     * @return java.util.List<com.ym.mec.biz.dal.entity.Subject>

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

@@ -320,7 +320,6 @@ public class ExportServiceImpl implements ExportService {
         exportFuncMap.put(ExportEnum.EXTRA_EXERCISES_REPLYS, info -> extraExercisesReplys(info));
         exportFuncMap.put(ExportEnum.EXERCISES_SITUATIONS, info -> studentExtracurricularExercisesSituationService.findStudentExtracurricularExercisesSituations(getQueryInfo(info, StudentExercisesSituationQueryInfo.class, true)).getRows());
         exportFuncMap.put(ExportEnum.IS_SETTLEMENT_COURSE_SALARYS, info -> isSettlementCourseSalarys(info));
-        exportFuncMap.put(ExportEnum.OPERATING_STUDENTS, info -> operatingStudents(info));
         exportFuncMap.put(ExportEnum.VIP_COURSE_REVIEWS, info -> vipCourseReviews(info));
         exportFuncMap.put(ExportEnum.DEGREE_REGISTRATION, info -> degreeRegistration(info));
         exportFuncMap.put(ExportEnum.COOPERATION_ORGAN, info -> cooperationOrganService.queryPage(getQueryInfo(info, CooperationOrganQueryInfo.class, true)).getRows());
@@ -876,47 +875,6 @@ public class ExportServiceImpl implements ExportService {
         return rows;
     }
 
-    //运营指标管理导出
-    @Override
-    public List operatingStudents(Map<String, Object> info) {
-        StudentOperatingQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), StudentOperatingQueryInfo.class);
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
-        PageInfo<Student4operating> PageOperatingStudents = studentManageService.getOperatingStudents(queryInfo);
-
-        if (PageOperatingStudents.getTotal() <= 0) {
-            throw new BizException("导出记录不存在");
-        }
-        List<Student4operating> rows = PageOperatingStudents.getRows();
-        for (Student4operating row : rows) {
-            if (row.getOperatingTag() != null && row.getOperatingTag() == 1) {
-                row.setOperatingTagStr("是");
-            } else {
-                row.setOperatingTagStr("否");
-            }
-            if (row.getVipTimes() != null && row.getVipTimes() > 0) {
-                row.setVipTimesStr("是");
-            } else {
-                row.setVipTimesStr("否");
-            }
-            if (row.getMusicNetWorkTimes() != null && row.getMusicNetWorkTimes() > 0) {
-                row.setMusicNetWorkTimesStr("是");
-            } else {
-                row.setMusicNetWorkTimesStr("否");
-            }
-            if (row.getFreePracticeTimes() != null && row.getFreePracticeTimes() > 0) {
-                row.setFreePracticeTimesStr("是");
-            } else {
-                row.setFreePracticeTimesStr("否");
-            }
-            if (row.getBuyPracticeTimes() != null && row.getBuyPracticeTimes() > 0) {
-                row.setBuyPracticeTimesStr("是");
-            } else {
-                row.setBuyPracticeTimesStr("否");
-            }
-        }
-        return rows;
-    }
-
     //vip评论列表导出
     @Override
     public List vipCourseReviews(Map<String, Object> info) {

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

@@ -92,7 +92,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Autowired
     private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
     @Autowired
-    private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
+    private StudentTeacherMapperDao studentTeacherMapperDao;
     @Autowired
     private MusicGroupBuildLogDao musicGroupBuildLogDao;
     @Autowired
@@ -1747,11 +1747,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
         //获取对外课程务老师
         teacherIds.addAll(teacherDao.findCommEducationalTeacherId(studentId));
-        //获取关联的指导老师
-        Student student = studentService.get(studentId);
-        if (student != null && student.getTeacherId() != null) {
-            teacherIds.add(student.getTeacherId());
-        }
+        //获取学员关联的老师
+        teacherIds.addAll(studentTeacherMapperDao.queryTeacherIds(studentId,null));
         if (teacherIds.size() > 0) {
             return teacherDao.queryTeacherBaseInfo(teacherIds, search);
         }

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

@@ -734,7 +734,6 @@ public class StudentManageServiceImpl implements StudentManageService {
         student.setOperatingTag(student.getOperatingTag());
         student.setOperatingTempTag(0);
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);
-        student.setTeacherId(student.getTeacherId());
         // 同步更新机构手机号 如果它存在
         SysUser user = teacherDao.getUser(student.getId());
         tenantInfoService.updatePhone(student.getPhone(), user.getPhone());
@@ -797,39 +796,6 @@ public class StudentManageServiceImpl implements StudentManageService {
     }
 
     @Override
-    public PageInfo<Student4operating> getOperatingStudents(StudentOperatingQueryInfo queryInfo) {
-        PageInfo<Student4operating> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-        Map<String, Object> params = new HashMap<>();
-        MapUtil.populateMap(params, queryInfo);
-        params.put("offset", pageInfo.getOffset());
-        Integer count = studentDao.countOperatingStudents(params);
-
-        List<Student4operating> dataList = new ArrayList<>();
-
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            dataList = studentDao.getOperatingStudents(params);
-
-            Set<Integer> studentIds = dataList.stream().map(Student4operating::getStudentId).collect(Collectors.toSet());
-
-            List<UserGroupDto> allUserGroups = studentRegistrationDao.getUserGroups(new ArrayList<>(studentIds));
-            Map<Integer, List<UserGroupDto>> userGroupsMap = new HashMap<>();
-            if (!CollectionUtils.isEmpty(allUserGroups)) {
-                userGroupsMap = allUserGroups.stream().collect(Collectors.groupingBy(UserGroupDto::getUserId));
-            }
-
-            for (Student4operating student4operating : dataList) {
-                List<UserGroupDto> userGroupDtos = userGroupsMap.get(student4operating.getStudentId());
-                if (!CollectionUtils.isEmpty(userGroupDtos)) {
-                    student4operating.setGroupNames(userGroupDtos.stream().filter(ug -> StringUtils.isNotBlank(ug.getGroupName())).map(UserGroupDto::getGroupName).sorted().collect(Collectors.joining(",")));
-                }
-            }
-        }
-        pageInfo.setRows(dataList);
-        return pageInfo;
-    }
-
-    @Override
     public List<BasicUserDto> queryCanAddStudent(String musicGroupId, String batchNo, String search, Integer subjectId) {
         return studentManageDao.queryCanAddStudent(musicGroupId, batchNo, search, subjectId);
     }

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

@@ -1,52 +1,16 @@
 package com.ym.mec.biz.service.impl;
 
-import static com.ym.mec.biz.dal.enums.IndexDataType.CLOUD_NEW_STUDENT_NUM;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-
+import com.alibaba.fastjson.JSONArray;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.page.*;
-import com.ym.mec.common.page.QueryInfo;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import com.alibaba.fastjson.JSONArray;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.enums.FivePlusGradeEnum;
-import com.ym.mec.biz.dal.enums.GradeTypeEnum;
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
-import com.ym.mec.biz.dal.enums.PeriodEnum;
-import com.ym.mec.biz.dal.enums.SixPlusGradeEnum;
-import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.biz.service.StudentService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysMessageService;
-import com.ym.mec.biz.service.SysTenantConfigService;
+import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.biz.dal.page.CloudTeacherActiveQueryInfo;
+import com.ym.mec.biz.dal.page.OrganCloudStudyStudentDataQueryInfo;
+import com.ym.mec.biz.dal.page.StudentQueryInfo;
+import com.ym.mec.biz.dal.page.UserBasicQueryInfo;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImResult;
@@ -59,6 +23,23 @@ import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
+import static com.ym.mec.biz.dal.enums.IndexDataType.CLOUD_NEW_STUDENT_NUM;
 
 @Service
 public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implements StudentService {
@@ -258,7 +239,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if (!CollectionUtils.isEmpty(practiceCourses)) {
                 practiceCourses.sort(Comparator.comparing(StudentTeacherCourseDto::getClassesStartTime).reversed());
                 Student student = new Student(studentCoursesEntry.getKey());
-                student.setTeacherId(practiceCourses.get(0).getTeacherId());
                 students.add(student);
                 continue;
             }
@@ -267,7 +247,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if (!CollectionUtils.isEmpty(vipCourses)) {
                 Student student = new Student(studentCoursesEntry.getKey());
                 vipCourses.sort(Comparator.comparing(StudentTeacherCourseDto::getClassesStartTime).reversed());
-                student.setTeacherId(vipCourses.get(0).getTeacherId());
                 students.add(student);
                 continue;
             }
@@ -276,7 +255,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if (!CollectionUtils.isEmpty(singleCourses)) {
                 Student student = new Student(studentCoursesEntry.getKey());
                 singleCourses.sort(Comparator.comparing(StudentTeacherCourseDto::getClassesStartTime).reversed());
-                student.setTeacherId(singleCourses.get(0).getTeacherId());
                 students.add(student);
                 continue;
             }
@@ -285,7 +263,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if (!CollectionUtils.isEmpty(mixCourses)) {
                 Student student = new Student(studentCoursesEntry.getKey());
                 mixCourses.sort(Comparator.comparing(StudentTeacherCourseDto::getClassesStartTime).reversed());
-                student.setTeacherId(mixCourses.get(0).getTeacherId());
                 students.add(student);
                 continue;
             }
@@ -298,10 +275,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         allStudentCourseInfo = null;
     }
 
-    @Override
-    public void batchUpdateAdviser(Integer teacherId, String studentIds) {
-        studentDao.batchUpdateAdviser(teacherId, studentIds);
-    }
 
     @Override
     public Integer updateGrade() {
@@ -346,7 +319,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if (CollectionUtils.isEmpty(studentClassInfo)) {
             return;
         }
-        //更新学员指导老师和声部信息
+        //更新学员声部信息
         List<Student> needUpdateStudents = new ArrayList<>();
         Map<Integer, List<StudentClassInfoDto>> scm = studentClassInfo.stream().collect(Collectors.groupingBy(StudentClassInfoDto::getStudentId));
         for (Student student : noTeacherOrNoSubjectStudent) {
@@ -355,9 +328,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
             List<StudentClassInfoDto> studentClassInfoDtos = scm.get(student.getUserId());
             StudentClassInfoDto studentClassInfoDto = studentClassInfoDtos.stream().max(Comparator.comparing(StudentClassInfoDto::getClassGroupId)).get();
-            if (Objects.isNull(student.getTeacherId())) {
-                student.setTeacherId(studentClassInfoDto.getMainTeacherId());
-            }
+//            if (Objects.isNull(student.getTeacherId())) {
+//                student.setTeacherId(studentClassInfoDto.getMainTeacherId());
+//            }
             if (StringUtils.isBlank(student.getSubjectIdList())) {
                 student.setSubjectIdList(studentClassInfoDto.getSubjectId().toString());
             }
@@ -1322,26 +1295,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     }
 
     @Override
-    public PageInfo<BasicUserDto> queryStudent(QueryInfo queryInfo) {
-        PageInfo<BasicUserDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-        Map<String, Object> params = new HashMap<>();
-        MapUtil.populateMap(params, queryInfo);
-
-        List<BasicUserDto> dataList = null;
-        int count = teacherDao.countStudent(params);
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            params.put("offset", pageInfo.getOffset());
-            dataList = teacherDao.queryStudent(params);
-        }
-        if (count == 0) {
-            dataList = new ArrayList<>();
-        }
-        pageInfo.setRows(dataList);
-        return pageInfo;
-    }
-
-    @Override
     public List<BaseMapDto> queryStuSubjectId(String organIds) {
         return studentDao.queryStuSubjectId(organIds);
     }

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

@@ -56,17 +56,16 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	private StudentVisitDao studentVisitDao;
 	@Autowired
 	private SysMessageService sysMessageService;
-	
     @Autowired
     private SysUserFeignService sysUserFeignService;
-
 	@Autowired
 	private SysConfigDao sysConfigDao;
 	@Autowired
 	private SysTenantConfigService sysTenantConfigService;
-
 	@Autowired
 	private MusicGroupDao musicGroupDao;
+	@Autowired
+	private StudentTeacherMapperDao studentTeacherMapperDao;
 
 	@Override
 	public BaseDAO<Long, SysMusicCompareRecord> getDAO() {
@@ -439,7 +438,13 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 			trainNum = "4";
 		}
 		params.put("trainNum",Integer.parseInt(trainNum));
-		int count = sysMusicCompareRecordDao.queryStudentTrain(params).size();
+		//获取老师关联的学员列表
+		List<Integer> studentIdList = studentTeacherMapperDao.queryStudentIds(queryInfo.getTeacherId(),null);
+		if(CollectionUtils.isEmpty(studentIdList)){
+			return pageInfo;
+		}
+		params.put("studentIdList",studentIdList);
+		int count = sysMusicCompareRecordDao.countStudentTrain(params);
 		List<CountStudentTrainDataDto> dataList = new ArrayList<>();
 		if(count > 0){
 			params.put("offset", pageInfo.getOffset());

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

@@ -7,7 +7,6 @@ import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.OaUserService;
@@ -83,7 +82,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
     @Autowired
-    private CloudTeacherDao cloudTeacherDao;
+    private StudentTeacherMapperDao studentTeacherMapperDao;
     @Autowired
     private TenantInfoService tenantInfoService;
     @Autowired
@@ -341,15 +340,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         teacherIds.addAll(teacherDao.findVipEducationalTeacherId(teacherId));
         //获取对外课程务老师
         teacherIds.addAll(teacherDao.findCommEducationalTeacherId(teacherId));
-        //获取关联的指导老师
-        Student student = studentDao.get(teacherId);
-        if (student != null && student.getTeacherId() != null) {
-            teacherIds.add(student.getTeacherId());
-        }
+        //获取关联的老师
+        teacherIds.addAll(studentTeacherMapperDao.queryTeacherIds(teacherId,null));
         if (teacherIds.size() > 0) {
             basicUserDtos.addAll(teacherDao.queryTeacherBaseInfo(teacherIds, search));
         }
-
         //获取关联的学员列表
         Set<Integer> studentIds = teacherDao.queryCourseClassStudentIds(teacherId);
         //获取关联的老师列表
@@ -627,11 +622,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
                 teacherServiceMap = teacherExercisesServiceSituations.stream().collect(Collectors.toMap(TeacherExercisesServiceDto::getTeacherId, t -> t));
             }
 
-            Map<Integer, String> operatingStudentsNum = MapUtil.convertMybatisMap(studentDao.getTeacherOperatingStudentsNum(id.toString()));
-            Map<Integer, String> practiceStudentsNum = MapUtil.convertMybatisMap(studentDao.getBuyNums(id.toString(), GroupType.PRACTICE));
-            Map<Integer, String> vipStudentsNum = MapUtil.convertMybatisMap(studentDao.getBuyNums(id.toString(), GroupType.VIP));
-            Map<Integer, String> practiceAndVipStudentsNum = MapUtil.convertMybatisMap(studentDao.getPracticeAndVipNums(id.toString()));
-
             //获取老师教学点列表
             List<School> teacherSchools = schoolDao.findByUserId(id);
             teacher.setTeacherSchools(teacherSchools);
@@ -658,18 +648,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
             } else {
                 teacher.setServiceIndex(BigDecimal.ZERO);
             }
-            //运营指标
-            String studentNum = operatingStudentsNum.get(id);
-            if (studentNum != null) {
-                String practiceNum = practiceStudentsNum.get(id) == null ? "0" : practiceStudentsNum.get(id);
-                String vipNum = vipStudentsNum.get(id) == null ? "0" : vipStudentsNum.get(id);
-                String practiceAndVipNum = practiceAndVipStudentsNum.get(id) == null ? "0" : practiceAndVipStudentsNum.get(id);
-                int allNum = Integer.parseInt(practiceNum) + Integer.parseInt(vipNum) - Integer.parseInt(practiceAndVipNum);
-                BigDecimal operatingIndex = new BigDecimal(allNum).multiply(new BigDecimal(100)).divide(new BigDecimal(studentNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
-                teacher.setOperatingIndex(operatingIndex);
-            } else {
-                teacher.setOperatingIndex(BigDecimal.ZERO);
-            }
         }
         return teacher;
     }

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

@@ -92,6 +92,8 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	private LuckDrawCountService luckDrawCountService;
 	@Autowired
 	private TempBuyDoubleElevenUserLogDao tempBuyDoubleElevenUserLogDao;
+	@Autowired
+	private StudentTeacherMapperDao studentTeacherMapperDao;
     @Autowired
     @Lazy
     private ContractService contractService;
@@ -868,12 +870,16 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
 							eduMap, null, 0, null, "SYSTEM", username, activityName);
 				}
-				Student student = studentDao.get(userId);
-				if (Objects.nonNull(student) && student.getTeacherId() != null) {
-					Map<Integer, String> teacherMap = new HashMap<>(1);
-					teacherMap.put(student.getTeacherId(), student.getTeacherId().toString());
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
-							teacherMap, null, 0, null, "TEACHER", username, activityName);
+				if(studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY
+						|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_BUY
+						|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_RENEW){
+					List<Integer> teacherIds = studentTeacherMapperDao.queryTeacherIds(userId, studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY ? "VIP" : "PRACTICE");
+					if(!CollectionUtils.isEmpty(teacherIds)){
+						Map<Integer, String> teacherMap = new HashMap<>(teacherIds.size());
+						teacherIds.stream().forEach(e->teacherMap.put(e,e.toString()));
+						sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
+								teacherMap, null, 0, null, "TEACHER", username, activityName);
+					}
 				}
 			}else {
 				SysUser user = teacherDao.getUser(userId);

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

@@ -192,7 +192,6 @@
         <result property="cooperationOrganName" column="cooperation_organ_name_"/>
         <result property="musicGroupName" column="music_group_name_"/>
         <result property="currentClass" column="current_class_"/>
-        <result property="realName" column="real_name_"/>
         <result property="username" column="username_"/>
         <result property="userId" column="user_id_"/>
         <result property="isReserve" column="is_reserve_"/>
@@ -226,7 +225,7 @@
     <select id="exportStatisticsDetail" resultMap="ChildrenStatisticsDetailDtoMap">
         SELECT o.name_ organ_name_,co.name_ cooperation_organ_name_,mg.name_ music_group_name_,cdr.user_id_,
         su.username_,su.phone_,s.name_
-        subject_name_,st.current_class_,sut.real_name_,cdr.is_reserve_,cdd.grade_level_,cdd.theory_level_,
+        subject_name_,st.current_class_,cdr.is_reserve_,cdd.grade_level_,cdd.theory_level_,
         CASE WHEN cdd.vip_1v1_price_ > 0 OR cdd.vip_1v2_price_ > 0 THEN 1 ELSE 0 END buy_vip_flag_,
         CASE WHEN cdd.theory_course_price_ > 0 THEN 1 ELSE 0 END buy_theory_course_flag_,cdd.total_amount_
         FROM children_day_reserve cdr
@@ -235,7 +234,6 @@
         LEFT JOIN cooperation_organ co ON co.id_ = cdr.cooperation_organ_id_
         LEFT JOIN music_group mg ON mg.id_ = cdr.music_group_id_
         LEFT JOIN student st ON st.user_id_ = cdr.user_id_
-        LEFT JOIN sys_user sut ON sut.id_ = st.teacher_id_
         LEFT JOIN sys_user su ON su.id_ = cdr.user_id_
         LEFT JOIN `subject` s ON s.id_ = cdd.subject_id_
         <where>

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

@@ -257,13 +257,12 @@
         <result property="chargeType" column="charge_type_name_"/>
         <result property="subjectName" column="subject_name_"/>
         <result property="currentGradeNum" column="current_grade_num_"/>
-        <result property="teacherName" column="teacher_name_"/>
         <result property="createTime" column="create_time_"/>
     </resultMap>
     <select id="queryCloudTeacherActiveDetail" resultMap="CloudTeacherActiveTargetDetailDto">
         SELECT su.username_,cto.remark_,cto.amount_,cto.student_id_,GROUP_CONCAT(DISTINCT co.name_) cooperation_name_,
         GROUP_CONCAT(DISTINCT mg.name_) music_group_name_,GROUP_CONCAT(DISTINCT ct.name_) charge_type_name_,
-        sj.name_ subject_name_,st.current_grade_num_,sus.real_name_ teacher_name_,cto.create_time_
+        sj.name_ subject_name_,st.current_grade_num_,cto.create_time_
         FROM cloud_teacher_order cto
         LEFT JOIN sys_user su ON su.id_ = cto.student_id_
         LEFT JOIN student_registration sr ON sr.user_id_ = cto.student_id_ AND sr.music_group_status_ = 'NORMAL'
@@ -271,7 +270,6 @@
         LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
         LEFT JOIN charge_type ct ON ct.id_ = mg.charge_type_id_
         LEFT JOIN student st ON st.user_id_ = cto.student_id_
-        LEFT JOIN sys_user sus ON sus.id_ = st.teacher_id_
         LEFT JOIN `subject` sj ON sj.id_ = st.subject_id_list_
         <include refid="queryCloudTeacherActiveDetailSql"/>
         GROUP BY cto.id_
@@ -466,9 +464,6 @@
             <if test="subjectId != null">
                 AND st.subject_id_list_ = #{subjectId}
             </if>
-            <if test="teacherId != null">
-                AND st.teacher_id_ = #{teacherId}
-            </if>
             <if test="tenantId != null">
                 AND cto.tenant_id_ = #{tenantId}
             </if>

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

@@ -446,6 +446,7 @@
         <result column="care_package_" property="carePackage"/>
         <result column="come_on_package_" property="comeOnPackage"/>
         <result column="tenant_id_" property="tenantId"/>
+        <result column="teacher_type_" property="teacherType"/>
     </resultMap>
 
     <select id="queryUserGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">

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

@@ -591,8 +591,6 @@
         <result property="groupId" column="music_group_id_"/>
         <result property="groupName" column="music_group_name_"/>
         <result property="groupType" column="group_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="guideTeacherId" column="guide_teacher_id_"/>
-        <result property="guideTeacherName" column="guide_teacher_name_"/>
         <result property="organId" column="organ_id_"/>
         <result property="organName" column="organ_name_"/>
         <result property="startClassTime" column="start_class_time_"/>
@@ -628,8 +626,7 @@
         SELECT MAX(o.name_) organ_name_,MAX(o.id_) organ_id_,MAX(cs.music_group_id_) music_group_id_,MAX(mg.name_) music_group_name_,MAX(su.username_) username_,MAX(cssp.user_id_) user_id_,
         MAX(cs.name_) course_schedule_name_,MAX(cs.id_) course_schedule_id_,
         MAX(cs.class_date_) class_date_,MAX(cs.start_class_time_) start_class_time_,MAX(cs.end_class_time_) end_class_time_,
-        MAX(su2.real_name_) guide_teacher_name_,MAX(st.teacher_id_) guide_teacher_id_
-        ,MAX(su1.real_name_) educational_teacher_name_,MAX(mg.educational_teacher_id_) educational_teacher_id_,MAX(cs.group_type_) group_type_,
+        MAX(su1.real_name_) educational_teacher_name_,MAX(mg.educational_teacher_id_) educational_teacher_id_,MAX(cs.group_type_) group_type_,
         MAX(cs.actual_teacher_id_) actual_teacher_id_,MAX(su3.real_name_) actual_teacher_name_,
         CASE WHEN MAX(sa.id_) IS NULL THEN 'TRUANT' ELSE MAX(sa.status_) END attendance_status_
         FROM course_schedule_student_payment cssp
@@ -648,7 +645,6 @@
         LEFT JOIN organization o ON o.id_ = cs.organ_id_
         LEFT JOIN student st ON st.user_id_ = cssp.user_id_
         LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
-        LEFT JOIN sys_user su2 ON su2.id_ = st.teacher_id_
         LEFT JOIN sys_user su3 ON su3.id_ = cs.actual_teacher_id_
         <include refid="exportStudentAttendancesQueryPageSql"/>
         GROUP BY cssp.id_

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

@@ -14,8 +14,6 @@
         <result column="service_tag_" property="serviceTag"/>
         <result column="operating_tag_" property="operatingTag"/>
         <result column="operating_temp_tag_" property="operatingTempTag"/>
-        <result column="teacher_id_" property="teacherId"/>
-        <result column="teacher_name_" property="teacherName"/>
         <result column="is_new_user_" property="isNewUser"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -87,7 +85,7 @@
         <if test="operatingTag != null">
             operating_tag_,
         </if>
-        teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
+        create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
         care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,
         membership_end_time_,current_grade_num_,current_class_,ext_subject_ids_,tenant_id_)
         VALUES
@@ -98,7 +96,7 @@
         <if test="operatingTag != null">
             #{operatingTag},
         </if>
-        #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
+        NOW(),NOW(),NOW(),#{cooperationOrganId},
          #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},
          #{membershipEndTime},#{currentGradeNum},#{currentClass},#{extSubjectIds},#{tenantId})
     </insert>
@@ -122,9 +120,6 @@
             <if test="operatingTempTag != null">
                 operating_temp_tag_ = #{operatingTempTag},
             </if>
-            <if test="teacherId != null">
-                teacher_id_=#{teacherId},
-            </if>
             <if test="isNewUser != null">
                 is_new_user_=#{isNewUser},
             </if>
@@ -261,9 +256,6 @@
                 <if test="item.operatingTempTag != null">
                     operating_temp_tag_ = #{item.operatingTempTag},
                 </if>
-                <if test="item.teacherId != null">
-                    teacher_id_=#{item.teacherId},
-                </if>
                 <if test="item.updateTime != null">
                     update_time_ = #{item.updateTime},
                 </if>
@@ -340,9 +332,6 @@
             </foreach>
         </if>
     </update>
-    <update id="batchUpdateAdviser">
-      UPDATE student s SET s.teacher_id_ = #{teacherId},s.update_time_ = NOW() WHERE FIND_IN_SET(s.user_id_,#{studentIds})
-    </update>
     <update id="updateServiceTag">
         UPDATE student SET service_tag_ = #{serviceTag},update_time_ = NOW() WHERE user_id_ IN
         <foreach collection="studentIds" item="item" open="(" separator="," close=")">
@@ -350,175 +339,6 @@
         </foreach>
     </update>
 
-    <resultMap id="student4operating" type="com.ym.mec.biz.dal.dto.Student4operating">
-        <result column="organ_name_" property="organName"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="student_name_" property="studentName"/>
-        <result column="student_id_" property="studentId"/>
-        <result column="teacher_id_" property="teacherId"/>
-        <result column="teacher_name_" property="teacherName"/>
-        <result column="operating_tag_" property="operatingTag"/>
-        <result column="vip_times_" property="vipTimes"/>
-        <result column="free_practice_times_" property="freePracticeTimes"/>
-        <result column="buy_practice_times_" property="buyPracticeTimes"/>
-        <result column="music_netWork_times_" property="musicNetWorkTimes"/>
-        <result column="student_num_" property="studentNum"/>
-    </resultMap>
-
-    <select id="getOperatingStudents" resultMap="student4operating">
-        SELECT su.organ_id_,
-        o.name_ organ_name_,
-        su.username_ student_name_,
-        s.user_id_ student_id_,
-        tsu.id_ teacher_id_,
-        tsu.real_name_ teacher_name_,
-        s.operating_tag_,
-        a.vip_times_,
-        a.buy_practice_times_,
-        a.music_netWork_times_,
-        p.free_practice_times_,
-        su.phone_
-        FROM student s
-        LEFT JOIN sys_user su ON s.user_id_ = su.id_
-        LEFT JOIN sys_user tsu ON tsu.id_ = s.teacher_id_
-        LEFT JOIN organization o ON o.id_ = su.organ_id_
-        LEFT JOIN (
-        SELECT cssp.user_id_,
-        SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
-        SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
-        SUM(case when (cs.type_='MUSIC_NETWORK' OR cs.type_='HIGH_ONLINE') then 1 ELSE 0 END) music_netWork_times_
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
-        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
-        GROUP BY cssp.user_id_
-        ) a on a.user_id_ = s.user_id_
-        LEFT JOIN (
-        SELECT student_id_, count(id_) free_practice_times_
-        FROM practice_group
-        WHERE type_='FREE' AND group_status_ IN ('NORMAL', 'FINISH')
-        GROUP BY student_id_
-        ) p ON p.student_id_ = s.user_id_
-        <include refid="student4OperatingQueryCondition"/>
-        ORDER BY s.user_id_
-        <include refid="global.limit"/>
-    </select>
-
-    <select id="countOperatingStudents" resultType="int">
-        SELECT COUNT(s.user_id_) FROM student s
-        LEFT JOIN sys_user su ON s.user_id_ = su.id_
-        LEFT JOIN sys_user tsu ON tsu.id_ = s.teacher_id_
-        LEFT JOIN (
-        SELECT cssp.user_id_,
-        SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
-        SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
-        SUM(case when (cs.type_='MUSIC_NETWORK' OR cs.type_='HIGH_ONLINE') then 1 ELSE 0 END) music_netWork_times_
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
-        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
-        GROUP BY cssp.user_id_
-        ) a on a.user_id_ = s.user_id_
-        LEFT JOIN (
-        SELECT student_id_, count(id_) free_practice_times_
-        FROM practice_group
-        WHERE type_='FREE' AND group_status_ IN ('NORMAL', 'FINISH')
-        GROUP BY student_id_
-        ) p ON p.student_id_ = s.user_id_
-        <include refid="student4OperatingQueryCondition"/>
-    </select>
-
-    <sql id="student4OperatingQueryCondition">
-        <where>
-            su.user_type_ LIKE '%STUDENT%' and s.tenant_id_ = #{tenantId}
-            <if test="search != null and search != ''">
-                AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_
-                LIKE CONCAT('%',#{search},'%'))
-            </if>
-            <if test="organId != null and organId != ''">
-                AND FIND_IN_SET(su.organ_id_,#{organId})
-            </if>
-            <if test="teacherId!=null">
-                AND s.teacher_id_ = #{teacherId}
-            </if>
-            <if test="operatingTag !=null">
-                AND s.operating_tag_ = #{operatingTag}
-            </if>
-            <if test='hasVip != null and hasVip=="1"'>
-                AND a.vip_times_ >=1
-            </if>
-            <if test='hasVip != null and hasVip=="0"'>
-                AND (a.vip_times_ =0 OR a.vip_times_ IS NULL)
-            </if>
-            <if test='hasFreePractice != null and hasFreePractice=="1"'>
-                AND p.free_practice_times_ >=1
-            </if>
-            <if test='hasFreePractice != null and hasFreePractice=="0"'>
-                AND (p.free_practice_times_ =0 OR p.free_practice_times_ IS NULL)
-            </if>
-            <if test='hasBuyPractice != null and hasBuyPractice=="1"'>
-                AND a.buy_practice_times_ >=1
-            </if>
-            <if test='hasBuyPractice != null and hasBuyPractice=="0"'>
-                AND (a.buy_practice_times_ =0 OR a.buy_practice_times_ IS NULL)
-            </if>
-            <if test='hasMusicNetWork != null and hasMusicNetWork=="1"'>
-                AND a.music_netWork_times_ >=1
-            </if>
-            <if test='hasMusicNetWork != null and hasMusicNetWork=="0"'>
-                AND (a.music_netWork_times_ =0 OR a.music_netWork_times_ IS NULL)
-            </if>
-        </where>
-    </sql>
-
-    <select id="getTeacherOperatingStudentsNum" resultType="java.util.Map">
-        select teacher_id_ 'key', count(*) 'value'
-        FROM student
-        WHERE FIND_IN_SET(teacher_id_, #{teacherIds})
-          AND operating_tag_ = 1
-        GROUP BY teacher_id_
-    </select>
-
-    <select id="getBuyNums" resultType="java.util.Map">
-        SELECT s.teacher_id_ 'key', COUNT(DISTINCT cssp.user_id_) 'value'
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.teach_mode_ = 'ONLINE'
-        LEFT JOIN student s ON s.user_id_ = cssp.user_id_
-        <if test="groupType != null and groupType==@com.ym.mec.biz.dal.enums.GroupType@PRACTICE">
-            LEFT JOIN practice_group pg ON cssp.music_group_id_ = pg.id_ AND cssp.group_type_ = 'PRACTICE'
-        </if>
-        WHERE s.teacher_id_ = #{teacherId}
-        AND cs.status_ IN ('NOT_START', 'UNDERWAY')
-        AND (cs.is_lock_ IS NULL OR cs.is_lock_ = 0)
-        <if test="groupType != null">
-            AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        </if>
-        <if test="groupType != null and groupType==@com.ym.mec.biz.dal.enums.GroupType@PRACTICE">
-            AND pg.group_status_ IN ('NORMAL', 'FINISH')
-            AND pg.buy_months_ >= 1
-        </if>
-        GROUP BY s.teacher_id_
-    </select>
-    <select id="getPracticeAndVipNums" resultType="java.util.Map">
-        SELECT s.teacher_id_ 'key', COUNT(DISTINCT pg.student_id_) 'value'
-        FROM practice_group pg
-                 LEFT JOIN student s on s.user_id_ = pg.student_id_
-                 LEFT JOIN course_schedule_student_payment vcssp
-                           ON vcssp.user_id_ = pg.student_id_ AND vcssp.group_type_ = 'VIP'
-                 LEFT JOIN course_schedule_student_payment pcssp
-                           ON pcssp.user_id_ = pg.student_id_ AND pcssp.group_type_ = 'PRACTICE'
-                 LEFT JOIN course_schedule vcs ON vcs.id_ = vcssp.course_schedule_id_ AND vcs.teach_mode_ = 'ONLINE'
-                 LEFT JOIN course_schedule pcs ON pcs.id_ = pcssp.course_schedule_id_
-        WHERE FIND_IN_SET(s.teacher_id_, #{teacherIds})
-          AND pg.group_status_ IN ('NORMAL', 'FINISH')
-          AND vcs.status_ IN ('NOT_START', 'UNDERWAY')
-          AND pcs.status_ IN ('NOT_START', 'UNDERWAY')
-          AND (vcs.is_lock_ IS NULL OR vcs.is_lock_ = 0)
-          AND (pcs.is_lock_ IS NULL OR pcs.is_lock_ = 0)
-          AND pg.buy_months_ >= 1
-        GROUP BY s.teacher_id_
-    </select>
-
     <select id="getServeStudentIds" resultType="int">
         SELECT user_id_
         FROM student stu
@@ -685,11 +505,12 @@
         </foreach>
     </select>
     <select id="getNoTeacherOrNoSubjectStudent" resultMap="Student">
-        SELECT * FROM student WHERE teacher_id_ IS NULL OR subject_id_list_ IS NULL OR cooperation_organ_id_ IS NULL limit 0,1000;
+        SELECT * FROM student WHERE subject_id_list_ IS NULL OR cooperation_organ_id_ IS NULL limit 0,1000;
     </select>
 
     <select id="getHasVipCourseStudentIdsFromNewStudents" resultType="int">
-        SELECT DISTINCT(spo.user_id_) from student_payment_order spo LEFT JOIN student s on spo.user_id_ = s.user_id_ WHERE spo.type_ in ('DOUBLE_ELEVEN2021','DOUBLE_ELEVEN2020','SMALL_CLASS_TO_BUY')
+        SELECT DISTINCT(spo.user_id_) from student_payment_order spo LEFT JOIN student s on spo.user_id_ = s.user_id_
+        WHERE spo.type_ in ('DOUBLE_ELEVEN2021','DOUBLE_ELEVEN2020','SMALL_CLASS_TO_BUY')
 		and spo.status_ = 'SUCCESS' and spo.expect_amount_ > 0 and s.is_new_user_ = 1
     </select>
     
@@ -1094,7 +915,8 @@
         GROUP BY cssp.course_schedule_id_
     </select>
     <select id="getStudentByHasCourse" resultType="java.lang.Integer">
-        SELECT s.user_id_ FROM student s WHERE s.teacher_id_ = #{teacherId} AND s.user_id_ IN (SELECT t.user_id_ FROM (
+        select distinct student_id_ from student_teacher_mapper WHERE teacher_id_ = #{teacherId}
+        AND student_id_ IN (SELECT t.user_id_ FROM (
         (SELECT sr.user_id_
         FROM student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
@@ -1328,9 +1150,11 @@
         GROUP BY sb.id_
     </select>
     <select id="queryStuSubjectIdByTeacherId" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
-        select sb.id_ 'key',sb.name_ 'value' from student s
+        select sb.id_ 'key',sb.name_ 'value' from
+        (select distinct student_id_ from student_teacher_mapper WHERE teacher_id_ = #{userId}) stm
+        left join student s ON stm.student_id_ = s.user_id_
         LEFT JOIN subject sb ON sb.id_ = s.subject_id_list_
-        WHERE s.teacher_id_ = #{userId} AND s.subject_id_list_ IS NOT NULL AND s.subject_id_list_ != ''
+        WHERE s.subject_id_list_ IS NOT NULL AND s.subject_id_list_ != ''
         GROUP BY sb.id_
     </select>
     <select id="queryByOperatingTag" resultType="java.lang.Integer">

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

@@ -97,12 +97,6 @@
         <result column="subject_name_" property="subject.name"/>
     </resultMap>
 
-    <resultMap id="UserGroupDto" type="com.ym.mec.biz.dal.dto.UserGroupDto">
-        <result column="user_id_" property="userId"/>
-        <result column="group_id_" property="groupId"/>
-        <result column="group_name_" property="groupName"/>
-    </resultMap>
-
     <resultMap id="Mapper" type="com.ym.mec.biz.dal.dto.Mapper">
         <result column="key_" property="key"/>
         <result column="value_" property="value"/>
@@ -1089,18 +1083,6 @@
         WHERE sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
         GROUP BY mg.organ_id_
     </select>
-
-    <select id="getUserGroups" resultMap="UserGroupDto">
-        SELECT DISTINCT sr.user_id_, mg.id_ group_id_, mg.name_ group_name_
-        FROM student_registration sr
-        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-        WHERE sr.payment_status_ = 2
-        AND sr.music_group_status_ = 'NORMAL'
-        AND sr.user_id_ IN
-        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-            #{userId}
-        </foreach>
-    </select>
     <select id="getNoPaymentStudent" resultMap="StudentRegistration">
         SELECT *
         FROM student_registration

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

@@ -25,8 +25,6 @@
 		VALUES(#{studentId},#{teacherId},#{teacherName},#{teacherType})
 	</insert>
 	
-	
-	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="StudentTeacherMapper" parameterType="map">
 		SELECT * FROM student_teacher_mapper <include refid="global.limit"/>
@@ -36,4 +34,18 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_teacher_mapper
 	</select>
+    <select id="queryTeacherIds" resultType="java.lang.Integer">
+		select distinct stm.teacher_id_ from student_teacher_mapper stm
+		where stm.student_id_ = #{studentId}
+		<if test="teacherType != null and teacherType != ''">
+			AND teacher_type_ = #{teacherType}
+		</if>
+	</select>
+	<select id="queryStudentIds" resultType="java.lang.Integer">
+		select distinct stm.student_id_ from student_teacher_mapper stm
+		where stm.teacher_id_ = #{teacherId}
+		<if test="teacherType != null and teacherType != ''">
+			AND teacher_type_ = #{teacherType}
+		</if>
+	</select>
 </mapper>

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

@@ -283,39 +283,22 @@
 		<result property="trainDay" column="train_day_"/>
 	</resultMap>
 	<select id="queryStudentTrain" resultMap="CountStudentTrainDataDto">
-		SELECT s.user_id_,su.avatar_,su.phone_,su.username_,ROUND(SUM(mcr.play_time_) / 60) total_play_time_,
+		SELECT su.id_ user_id_,su.avatar_,su.phone_,su.username_,ROUND(SUM(mcr.play_time_) / 60) total_play_time_,
 			   COUNT(DISTINCT DATE_FORMAT(mcr.create_time_,"%Y-%m-%d")) train_day_,
 			   COUNT(DISTINCT mcr.behavior_id_) train_num_,
 		COUNT(CASE WHEN mcr.feature_ = 'CLOUD_STUDY_EVALUATION' THEN mcr.behavior_id_ ELSE NULL END) record_num_
-		FROM teacher t
-				 LEFT JOIN student s ON t.id_ = s.teacher_id_
-				 LEFT JOIN sys_user su ON su.id_ = s.user_id_
-				 LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
+		FROM sys_user su
+		LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = su.id_
 		<if test="startTime != null and startTime != ''">
 			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') >= #{startTime} OR mcr.id_ IS NULL)
 		</if>
 		<if test="endTime != null and endTime != ''">
 			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') &lt;= #{endTime} OR mcr.id_ IS NULL)
 		</if>
-		WHERE s.teacher_id_ = #{teacherId}
-		<if test="search != null and search != ''">
-			AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
-		</if>
-		<if test="visitStudents != null and visitStudents.size > 0">
-			AND s.user_id_ NOT IN
-			<foreach collection="visitStudents" open="(" close=")" item="userId" separator=",">
-				#{userId}
-			</foreach>
-		</if>
-		<if test="hasCourseUserIds != null and hasCourseUserIds.size > 0">
-			AND s.user_id_ IN
-			<foreach collection="hasCourseUserIds" open="(" close=")" item="userId" separator=",">
-				#{userId}
-			</foreach>
-		</if>
-		GROUP BY s.user_id_
+		<include refid="queryStudentTrainSql"/>
+		GROUP BY su.id_
 		<if test="having == 1">
-			HAVING total_play_time_ &lt; ${totalTime} OR train_num_ &lt; ${trainNum}
+			HAVING mcr.total_play_time_ &lt; ${totalTime} OR mcr.train_num_ &lt; ${trainNum}
 		</if>
 		ORDER BY
 		<if test="sort != null and sort != ''">
@@ -327,9 +310,50 @@
 		<if test="sort == null or sort == ''">
 			total_play_time_ DESC
 		</if>
-		,s.user_id_
+		,su.id_
 		<include refid="global.limit"/>
 	</select>
+	<select id="countStudentTrain" resultType="int">
+		SELECT COUNT(distinct su.id_)
+		FROM sys_user su
+		LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = su.id_
+		<if test="startTime != null and startTime != ''">
+			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') >= #{startTime} OR mcr.id_ IS NULL)
+		</if>
+		<if test="endTime != null and endTime != ''">
+			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') &lt;= #{endTime} OR mcr.id_ IS NULL)
+		</if>
+		<include refid="queryStudentTrainSql"/>
+		<if test="having == 1">
+			AND total_play_time_ &lt; ${totalTime} OR train_num_ &lt; ${trainNum}
+		</if>
+	</select>
+
+	<sql id="queryStudentTrainSql">
+		<where>
+			<if test="studentIdList != null and studentIdList.size > 0">
+				AND su.id_ IN
+				<foreach collection="studentIdList" open="(" close=")" item="userId" separator=",">
+					#{userId}
+				</foreach>
+			</if>
+			<if test="search != null and search != ''">
+				AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
+			</if>
+			<if test="visitStudents != null and visitStudents.size > 0">
+				AND su.id_ NOT IN
+				<foreach collection="visitStudents" open="(" close=")" item="userId" separator=",">
+					#{userId}
+				</foreach>
+			</if>
+			<if test="hasCourseUserIds != null and hasCourseUserIds.size > 0">
+				AND su.id_ IN
+				<foreach collection="hasCourseUserIds" open="(" close=")" item="userId" separator=",">
+					#{userId}
+				</foreach>
+			</if>
+		</where>
+	</sql>
 
 	<select id="getOrganNewCloudStudyNum" resultType="int">
 		SELECT

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

@@ -1338,14 +1338,15 @@
         GROUP BY mg.id_
     </select>
     <select id="queryStudent" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.username_,s.user_id_,su.phone_ FROM student s
-        LEFT JOIN sys_user su ON s.user_id_ = su.id_
-        WHERE s.teacher_id_ = #{search}
+        SELECT su.username_,stm.student_id_ user_id_,su.phone_,stm.teacher_type_
+        FROM student_teacher_mapper stm
+        LEFT JOIN sys_user su ON stm.student_id_ = su.id_
+        WHERE stm.teacher_id_ = #{search}
         <include refid="global.limit"/>
     </select>
     <select id="countStudent" resultType="java.lang.Integer">
-        SELECT COUNT(s.user_id_) FROM student s
-        WHERE s.teacher_id_ = #{search}
+        SELECT COUNT(stm.student_id_) FROM student_teacher_mapper stm
+        WHERE stm.teacher_id_ = #{search}
     </select>
     
     <select id="queryTeacherDefaultSalary" resultMap="TeacherDefaultSalaryDto">

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

@@ -1,17 +1,15 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,18 +24,14 @@ import org.springframework.web.bind.annotation.RestController;
 public class ExtracurricularExercisesReplyController extends BaseController {
 
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
 
     @ApiOperation(value = "获取学生的课外训练列表")
     @GetMapping("/findStudentExtraExercises")
     public HttpResponseResult findStudentExtraExercises(ExtraExercilseQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setStudentId(sysUser.getId());
+        queryInfo.setStudentId(sysUserService.getUserId());
         return succeed(extracurricularExercisesReplyService.findStudentExtraExercises(queryInfo));
     }
 

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

@@ -1,15 +1,13 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CountStudentTrainDataDto;
 import com.ym.mec.biz.dal.dto.MusicCompareRankingDto;
 import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
 import com.ym.mec.biz.dal.page.SysMusicCompareRecordQueryInfo;
 import com.ym.mec.biz.service.SysMusicCompareRecordService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +28,7 @@ import static com.ym.mec.biz.dal.enums.FeatureType.CLOUD_STUDY_EVALUATION;
 public class CloudStudyController extends BaseController {
 
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private SysMusicCompareRecordService sysMusicCompareRecordService;
 
@@ -49,11 +47,7 @@ public class CloudStudyController extends BaseController {
     @ApiOperation("学员训练统计")
     @GetMapping("countStudentTrain")
     public HttpResponseResult<PageInfo<CountStudentTrainDataDto>> countStudentTrain(SysMusicCompareRecordQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(sysMusicCompareRecordService.countStudentTrain(queryInfo));
     }
 

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

@@ -265,9 +265,9 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "合作单位", "乐团", "学员编号", "学员姓名", "手机号", "声部", "所在班级", "指导老师", "是否预约", "器乐等级", "乐理等级", "是否购买VIP", "是否购买乐理课"}, new String[]{
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "合作单位", "乐团", "学员编号", "学员姓名", "手机号", "声部", "所在班级", "是否预约", "器乐等级", "乐理等级", "是否购买VIP", "是否购买乐理课"}, new String[]{
                     "organName", "cooperationOrganName", "musicGroupName", "userId", "username", "phone", "subjectName",
-                    "currentClass", "realName", "isReserve == true ?'是':'否'", "gradeLeave"
+                    "currentClass", "isReserve == true ?'是':'否'", "gradeLeave"
                     , "theoryLevel", "buyVipFlag == true ?'是':'否'", "buyTheoryCourseFlag == true ?'是':'否'"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
@@ -609,9 +609,9 @@ public class ExportController extends BaseController {
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部编号", "分部名称", "课程组类型", "课程组编号", "课程组名称", "学员姓名",
                     "学员编号", "课程编号", "课程名称", "上课日期", "上课开始时间", "上课结束时间",
-                    "指导老师名称", "指导老师编号", "教务老师名称", "教务老师编号", "授课老师名称", "授课老师编号", "学员考勤状态"}, new String[]{
+                    "教务老师名称", "教务老师编号", "授课老师名称", "授课老师编号", "学员考勤状态"}, new String[]{
                     "organId", "organName", "groupType.desc", "groupId", "groupName", "username",
-                    "userId", "courseScheduleId", "courseScheduleName", "classDate", "startClassTime", "endClassTime", "guideTeacherName", "guideTeacherId"
+                    "userId", "courseScheduleId", "courseScheduleName", "classDate", "startClassTime", "endClassTime"
                     , "educationalTeacherName", "educationalTeacherId", "actualTeacherName", "actualTeacherId", "studentAttendanceStatus.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=studentAttendance-" + DateUtil.getDate(new Date()) + ".xls");
@@ -1592,7 +1592,7 @@ public class ExportController extends BaseController {
         OutputStream ouputStream = null;
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(
-                    new String[]{"学员编号", "学员姓名", "所属分部", "乐团名称", "指导老师", "教务老师", "服务课程",
+                    new String[]{"学员编号", "学员姓名", "所属分部", "乐团名称", "服务老师", "教务老师", "服务课程",
                             "预期安排", "实际安排", "提交次数", "评价次数", "及时评价次数", "付费网管课", "VIP课", "训练提交时间"},
                     new String[]{"studentId", "studentName", "organName", "groupNames", "teacherName",
                             "educationalTeacherName", "serveType == 'EXERCISE' ? '课外训练':courseIds",
@@ -1681,71 +1681,6 @@ public class ExportController extends BaseController {
     }
 
 
-    @ApiOperation(value = "运营指标管理导出")
-    @GetMapping("export/operatingStudents")
-    @PreAuthorize("@pcs.hasPermissions('export/operatingStudents')")
-    public void operatingStudents(StudentOperatingQueryInfo queryInfo, HttpServletResponse response) {
-        queryInfo.setPage(1);
-        queryInfo.setRows(49999);
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
-        PageInfo<Student4operating> PageOperatingStudents = studentManageService.getOperatingStudents(queryInfo);
-
-        if (PageOperatingStudents.getTotal() <= 0) {
-            throw new BizException("导出记录不存在");
-        }
-        List<Student4operating> rows = PageOperatingStudents.getRows();
-        for (Student4operating row : rows) {
-            if (row.getOperatingTag() != null && row.getOperatingTag() == 1) {
-                row.setOperatingTagStr("是");
-            } else {
-                row.setOperatingTagStr("否");
-            }
-            if (row.getVipTimes() != null && row.getVipTimes() > 0) {
-                row.setVipTimesStr("是");
-            } else {
-                row.setVipTimesStr("否");
-            }
-            if (row.getMusicNetWorkTimes() != null && row.getMusicNetWorkTimes() > 0) {
-                row.setMusicNetWorkTimesStr("是");
-            } else {
-                row.setMusicNetWorkTimesStr("否");
-            }
-            if (row.getFreePracticeTimes() != null && row.getFreePracticeTimes() > 0) {
-                row.setFreePracticeTimesStr("是");
-            } else {
-                row.setFreePracticeTimesStr("否");
-            }
-            if (row.getBuyPracticeTimes() != null && row.getBuyPracticeTimes() > 0) {
-                row.setBuyPracticeTimesStr("是");
-            } else {
-                row.setBuyPracticeTimesStr("否");
-            }
-        }
-        OutputStream ouputStream = null;
-        try {
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(
-                    new String[]{"分部", "乐团名称", "学生", "学生编号", "指导老师", "指导老师id", "参与运营指标", "有线上VIP课", "参与免费网管课", "有付费网管课", "有乐团网管课"},
-                    new String[]{"organName", "groupNames", "studentName", "studentId", "teacherName", "teacherId",
-                            "operatingTagStr", "vipTimesStr", "freePracticeTimesStr", "buyPracticeTimesStr", "musicNetWorkTimesStr"}, rows);
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            ouputStream = response.getOutputStream();
-            workbook.write(ouputStream);
-            ouputStream.flush();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (ouputStream != null) {
-                try {
-                    ouputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
     @ApiOperation(value = "vip评论列表导出")
     @RequestMapping("export/vipCourseReviews")
     @PreAuthorize("@pcs.hasPermissions('export/vipCourseReviews')")
@@ -2584,9 +2519,9 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"学员编号", "学员", "合作单位", "乐团", "乐团模式", "声部", "年级", "指导老师", "购买套餐", "购买金额"};
+            String[] header = {"学员编号", "学员", "合作单位", "乐团", "乐团模式", "声部", "年级", "购买套餐", "购买金额"};
             String[] body = {"userId", "username", "cooperationName", "musicGroupName", "chargeType",
-                    "subjectName", "currentGradeNum", "teacherName", "remark", "amount"};
+                    "subjectName", "currentGradeNum", "remark", "amount"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -1,66 +1,24 @@
 package com.ym.mec.web.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.ym.mec.biz.dal.dto.ActivityCourseDetailDto;
-import com.ym.mec.biz.dal.dto.CloudStudyStudentDataDto;
-import com.ym.mec.biz.dal.dto.EduOrganStudentDataDto;
-import com.ym.mec.biz.dal.dto.IndexCloudStudyListDto;
-import com.ym.mec.biz.dal.dto.StatDto;
-import com.ym.mec.biz.dal.dto.StudentSubTotalCourseTimesDto;
-import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.Student;
-import com.ym.mec.biz.dal.page.CloudTeacherActiveQueryInfo;
-import com.ym.mec.biz.dal.page.MusicGroupStudentQueryInfo;
-import com.ym.mec.biz.dal.page.OrganCloudStudyStudentDataQueryInfo;
-import com.ym.mec.biz.dal.page.StudentActivityQueryInfo;
-import com.ym.mec.biz.dal.page.StudentErrorLeaveQueryInfo;
-import com.ym.mec.biz.dal.page.StudentManageAttendanceQueryInfo;
-import com.ym.mec.biz.dal.page.StudentManageCourseQueryInfo;
-import com.ym.mec.biz.dal.page.StudentManageQueryInfo;
-import com.ym.mec.biz.dal.page.StudentManageVipClassQueryInfo;
-import com.ym.mec.biz.dal.page.StudentOperatingQueryInfo;
-import com.ym.mec.biz.dal.page.StudentQueryInfo;
-import com.ym.mec.biz.dal.page.StudentSignQueryInfo;
-import com.ym.mec.biz.dal.page.StudentSubTotalCourseTimesQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherPaymentRecordInfo;
-import com.ym.mec.biz.dal.page.UserBasicQueryInfo;
-import com.ym.mec.biz.service.MusicGroupStudentFeeService;
-import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.biz.service.StudentCourseHomeworkService;
-import com.ym.mec.biz.service.StudentManageService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.biz.dal.page.*;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Api(tags = "学生管理")
 @RestController
@@ -344,14 +302,6 @@ public class StudentManageController extends BaseController {
         return succeed(studentManageService.sumStudentAttendance(courseScheduleId));
     }
 
-    @ApiOperation(value = "获取运营指标列表")
-    @GetMapping("/getOperatingStudents")
-    @PreAuthorize("@pcs.hasPermissions('studentManage/getOperatingStudents')")
-    public Object getOperatingStudents(StudentOperatingQueryInfo queryInfo){
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
-        return succeed(studentManageService.getOperatingStudents(queryInfo));
-    }
-
     @ApiOperation(value = "新增会员试用")
     @PostMapping("/updateMemberExperience")
     @PreAuthorize("@pcs.hasPermissions('studentManage/updateMemberExperience')")
@@ -364,15 +314,7 @@ public class StudentManageController extends BaseController {
     @GetMapping("/initTeacherId")
     @PreAuthorize("@pcs.hasPermissions('studentManage/initTeacherId')")
     public HttpResponseResult initTeacherId(){
-        studentService.initTeacherId();
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改学员的指导老师")
-    @PostMapping("/batchUpdateAdviser")
-    @PreAuthorize("@pcs.hasPermissions('studentManage/batchUpdateAdviser')")
-    public Object batchUpdateAdviser(Integer teacherId,String studentIds){
-        studentService.batchUpdateAdviser(teacherId,studentIds);
+//        studentService.initTeacherId();
         return succeed();
     }
 

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.dto.TeacherStudentDataDto;
+import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -19,6 +20,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @RequestMapping("teacher")
 @Api(tags = "教师服务")
 @RestController
@@ -34,7 +38,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取老师列表（基本信息）")
     @GetMapping("/queryTeacherBasicInfo")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryTeacherBasicInfo')")
-    public Object queryTeacherBasicInfo(UserBasicQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<SysUserDto>> queryTeacherBasicInfo(UserBasicQueryInfo queryInfo){
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(teacherService.queryTeacherBasicInfo(queryInfo));
     }
@@ -42,14 +46,14 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "新增教师")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('teacher/add')")
-    public HttpResponseResult add(Teacher teacher) throws Exception {
+    public HttpResponseResult<Integer> add(Teacher teacher) throws Exception {
         return succeed(teacherService.add(teacher));
     }
 
     @ApiOperation(value = "分页查询教师列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryPage')")
-    public Object queryPage(TeacherQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<Teacher>> queryPage(TeacherQueryInfo queryInfo) {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(teacherService.queryPageDetail(queryInfo));
     }
@@ -58,7 +62,7 @@ public class TeacherController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('teacher/update')")
     @AuditLogAnnotation(operateName = "修改教师信息")
-    public Object update(Teacher teacher) {
+    public HttpResponseResult<Object> update(Teacher teacher) {
         teacherService.updateTea(teacher);
         return succeed();
     }
@@ -67,7 +71,7 @@ public class TeacherController extends BaseController {
     @PostMapping("/update1")
     @PreAuthorize("@pcs.hasPermissions('teacher/update1')")
     @AuditLogAnnotation(operateName = "修改教师信息(不包含离职日期等信息)")
-    public Object update1(Teacher teacher) {
+    public HttpResponseResult<Object> update1(Teacher teacher) {
         teacherService.updateTea1(teacher);
         return succeed();
     }
@@ -77,14 +81,14 @@ public class TeacherController extends BaseController {
     @ApiParam(value = "教师编号", required = true)
     @PreAuthorize("@pcs.hasPermissions('teacher/get')")
     @ApiImplicitParams({@ApiImplicitParam(name = "teacherId", value = "教师编号", required = true, dataType = "Integer")})
-    public Object get(Integer teacherId) {
+    public HttpResponseResult<Teacher> get(Integer teacherId) {
         return succeed(teacherService.getDetail(teacherId));
     }
 
     @ApiOperation(value = "获取分部所有老师")
     @GetMapping("/findTeachers")
     @PreAuthorize("@pcs.hasPermissions('teacher/findTeachers','system')")
-    public HttpResponseResult findTeachers(String organId,Boolean demissionFlag, Boolean isForzenWithQueryCondition) {
+    public HttpResponseResult<List<TeacherBasicDto>> findTeachers(String organId, Boolean demissionFlag, Boolean isForzenWithQueryCondition) {
         organId = organizationService.getEmployeeOrgan(organId);
         demissionFlag = false;
         if(isForzenWithQueryCondition == null){
@@ -96,14 +100,14 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "根据科目获取部门下的教师")
     @GetMapping("/findOrganTeacherBySubject")
     @PreAuthorize("@pcs.hasPermissions('teacher/findOrganTeacherBySubject')")
-    public HttpResponseResult findOrganTeacherBySubject(Integer subjecId) {
+    public HttpResponseResult<List<Teacher>> findOrganTeacherBySubject(Integer subjecId) {
         return succeed(teacherService.findOrganTeacherBySubject(subjecId));
     }
 
     @ApiOperation(value = "获取分部教师")
     @GetMapping("/findTeacherByOrganId")
     @PreAuthorize("@pcs.hasPermissions('teacher/findTeacherByOrganId')")
-    public HttpResponseResult findTeacherByOrganId(String organId,String subjectIds,String jobNature) {
+    public HttpResponseResult<List<Teacher>> findTeacherByOrganId(String organId, String subjectIds, String jobNature) {
         organId = organizationService.getEmployeeOrgan(organId);
         return succeed(teacherService.findTeacherByOrganId(organId,subjectIds,jobNature));
     }
@@ -111,7 +115,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "分页获取教师名称编号列表")
     @GetMapping("/queryNameList")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryNameList', 'system', 'education')")
-    public HttpResponseResult queryPageName(TeacherNameQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<Teacher>> queryPageName(TeacherNameQueryInfo queryInfo) {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(teacherService.queryPageName(queryInfo));
     }
@@ -120,21 +124,21 @@ public class TeacherController extends BaseController {
     @GetMapping("/findMusicGroupTeachers")
     @PreAuthorize("@pcs.hasPermissions('teacher/findMusicGroupTeachers')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
-    public HttpResponseResult findMusicGroupTeachers(String musicGroupId){
+    public HttpResponseResult<List<BasicUserDto>> findMusicGroupTeachers(String musicGroupId){
         return succeed(teacherService.queryMusicGroupTeacher(musicGroupId));
     }
 
     @ApiOperation(value = "分页查询乐团管理--详情--老师列表")
     @GetMapping("/queryMusicGroupTeachers")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryMusicGroupTeachers')")
-    public HttpResponseResult queryMusicGroupTeachers(MusicGroupTeachersQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<MusicGroupTeachersDto>> queryMusicGroupTeachers(MusicGroupTeachersQueryInfo queryInfo){
         return succeed(teacherService.queryMusicGroupTeachers(queryInfo));
     }
 
     @ApiOperation(value = "分页查询乐团管理--详情--老师上课记录")
     @GetMapping("/queryTeacherAttendance")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryTeacherAttendance')")
-    public HttpResponseResult queryTeacherAttendance(MusicGroupTeacherAttendanceQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<MusicGroupTeacherAttendanceDto>> queryTeacherAttendance(MusicGroupTeacherAttendanceQueryInfo queryInfo){
         return succeed(teacherService.queryTeacherAttendance(queryInfo));
     }
 
@@ -142,28 +146,28 @@ public class TeacherController extends BaseController {
     @GetMapping("/getTeacherMusicClass")
     @ApiParam(value = "教师编号", required = true)
     @PreAuthorize("@pcs.hasPermissions('teacher/getTeacherMusicClass')")
-    public Object getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<TeacherMusicClassInfoDto>> getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo){
         return succeed(classGroupService.getTeacherMusicClass(queryInfo));
     }
 
     @ApiOperation(value = "获取老师VIP课程信息列表")
     @GetMapping("/getTeacherVipClass")
     @PreAuthorize("@pcs.hasPermissions('teacher/getTeacherVipClass')")
-    public Object getTeacherVipClass(VipClassQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<TeacherVipClassInfoDto>> getTeacherVipClass(VipClassQueryInfo queryInfo){
         return succeed(classGroupService.getTeacherVipClass(queryInfo));
     }
 
     @ApiOperation(value = "获取教师上课结算列表")
     @GetMapping("/queryCloses")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryCloses')")
-    public Object queryCloses(TeacherCloseQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<TeacherCloseDto>> queryCloses(TeacherCloseQueryInfo queryInfo){
         return succeed(teacherService.queryCloses(queryInfo));
     }
 
     @ApiOperation(value = "获取教师上课课酬未结算总额")
     @GetMapping("/sumTeacherNoPay")
     @PreAuthorize("@pcs.hasPermissions('teacher/sumTeacherNoPay')")
-    public Object findTeacherNoPay(Integer teacherId){
+    public HttpResponseResult<BigDecimal> findTeacherNoPay(Integer teacherId){
         return succeed(teacherService.findTeacherNoPay(teacherId));
     }
 
@@ -171,14 +175,14 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取教师布置的作业")
     @GetMapping("/getCourseScheduleHomework")
     @PreAuthorize("@pcs.hasPermissions('teacher/getCourseScheduleHomework')")
-    public Object getCourseScheduleHomework(Integer courseScheduleId){
+    public HttpResponseResult<CourseHomework> getCourseScheduleHomework(Integer courseScheduleId){
         return succeed(teacherService.getCourseScheduleHomework(courseScheduleId));
     }
 
     @ApiOperation(value = "获取老师指导的学员列表")
     @GetMapping("/queryStudent")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryStudent')")
-    public Object queryStudent(QueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<BasicUserDto>> queryStudent(QueryInfo queryInfo){
         return succeed(teacherService.queryStudent(queryInfo));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -1,8 +1,6 @@
 package com.ym.mec.web.controller.education;
 
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;

mec-web/src/main/resources/exportColumnMapper.ini

@@ -158,10 +158,6 @@ fieldColumns = ["studentId", "studentName", "organName", "groupNames", "teacherN
 headColumns = ["分部", "课程组类型", "课程编号", "时间", "课程名称", "老师编号", "老师姓名", "签到时间", "签退时间",        "学员缴费", "课酬类型", "应发课酬", "课酬扣款", "结算课酬", "状态", "备注", "扣款原因"]
 fieldColumns = ["organName", "groupType.desc", "courseScheduleId", "startClassTime", "courseName", "teacherId", "teacherName",         "signInStatusStr", "signOutStatusStr", "actualReceipts", "salaryType", "actualSalary", "reduceSalary", "finalSalary",         "confirmStatus.desc", "memo", "deductionReason"]
 
-[运营指标管理导出]
-headColumns = ["分部", "乐团名称", "学生", "学生编号", "指导老师", "指导老师id", "参与运营指标", "有线上VIP课", "参与免费网管课", "有付费网管课", "有乐团网管课"]
-fieldColumns = ["organName", "groupNames", "studentName", "studentId", "teacherName", "teacherId",          "operatingTagStr", "vipTimesStr", "freePracticeTimesStr", "buyPracticeTimesStr", "musicNetWorkTimesStr"]
-
 [vip评论列表导出]
 headColumns = ["分部", "上课日期", "课程编号", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置训练）", "是否布置训练", "是否提交训练", "教务老师", "教务评价"]
 fieldColumns = ["organName", "classDateStr", "id", "courseName", "teacherName", "teachingMaterial",  "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "assignHomeworkStr",  "handHomeworkStr", "eduTeacherName", "courseReview"]