update

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

@@ -1,23 +1,19 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
+import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
-import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import com.ym.mec.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(music_group):
  */
+@Data
 public class MusicGroup extends BaseEntity {
 
 	/**  */
@@ -55,11 +51,12 @@ public class MusicGroup extends BaseEntity {
 	private java.util.Date preApplyExpireDate;
 	
 	/** 团长 */
-	@ApiModelProperty(value = "运营主管",required = false)
-	private Integer teamTeacherId;
+//	@ApiModelProperty(value = "运营主管",required = false)
+//	private Integer teamTeacherId;
+
 	/** 团长 */
-	@ApiModelProperty(value = "运营主管名称",required = false)
-	private String teamTeacherName;
+//	@ApiModelProperty(value = "运营主管名称",required = false)
+//	private String teamTeacherName;
 	
 	/** 教务老师 */
 	@ApiModelProperty(value = "教务老师名字",required = false)
@@ -239,597 +236,12 @@ public class MusicGroup extends BaseEntity {
     @ApiModelProperty(value = "学生分布",required = false)
     private String gradeType;
 
-    public String getGradeType() {
-        return gradeType;
-    }
-
-    public void setGradeType(String gradeType) {
-        this.gradeType = gradeType;
-    }
-
-    public String getMusicalInstrumentsProvideTime() {
-		return musicalInstrumentsProvideTime;
-	}
-
-	public void setMusicalInstrumentsProvideTime(String musicalInstrumentsProvideTime) {
-		this.musicalInstrumentsProvideTime = musicalInstrumentsProvideTime;
-	}
-
-	public Integer getHasInstrumentNum() {
-		return hasInstrumentNum;
-	}
-
-	public void setHasInstrumentNum(Integer hasInstrumentNum) {
-		this.hasInstrumentNum = hasInstrumentNum;
-	}
-
-	public Integer getHomeworkPushFlag() {
-		return homeworkPushFlag;
-	}
-
-	public void setHomeworkPushFlag(Integer homeworkPushFlag) {
-		this.homeworkPushFlag = homeworkPushFlag;
-	}
-
-	public Integer getCloudTeacherType() {
-		return cloudTeacherType;
-	}
-
-	public void setCloudTeacherType(Integer cloudTeacherType) {
-		this.cloudTeacherType = cloudTeacherType;
-	}
-
 	@ApiModelProperty(value = "进行中,缴费按钮控制",required = true)
 	private Boolean isRemedy = false;
 
-	public String getTransactionTeacherName() {
-		return transactionTeacherName;
-	}
-
-	public void setTransactionTeacherName(String transactionTeacherName) {
-		this.transactionTeacherName = transactionTeacherName;
-	}
-
-	public Integer getTransactionTeacherId() {
-		return transactionTeacherId;
-	}
-
-	public void setTransactionTeacherId(Integer transactionTeacherId) {
-		this.transactionTeacherId = transactionTeacherId;
-	}
-
-	public String getRepairUserName() {
-		return repairUserName;
-	}
-
-	public void setRepairUserName(String repairUserName) {
-		this.repairUserName = repairUserName;
-	}
-
-	public Integer getPaymentPattern() {
-		return paymentPattern;
-	}
-
-	public void setPaymentPattern(Integer paymentPattern) {
-		this.paymentPattern = paymentPattern;
-	}
-
-	public Date getPaymentValidStartDate() {
-		return paymentValidStartDate;
-	}
-
-	public void setPaymentValidStartDate(Date paymentValidStartDate) {
-		this.paymentValidStartDate = paymentValidStartDate;
-	}
-
-	public Date getPaymentValidEndDate() {
-		return paymentValidEndDate;
-	}
-
-	public void setPaymentValidEndDate(Date paymentValidEndDate) {
-		this.paymentValidEndDate = paymentValidEndDate;
-	}
-
-	public String getSubjectName() {
-		return subjectName;
-	}
-
-	public void setSubjectName(String subjectName) {
-		this.subjectName = subjectName;
-	}
-
-	public Integer getRepairUserId() {
-		return repairUserId;
-	}
-
-	public void setRepairUserId(Integer repairUserId) {
-		this.repairUserId = repairUserId;
-	}
-
-	public String getDirectorUserName() {
-		return directorUserName;
-	}
-
-	public void setDirectorUserName(String directorUserName) {
-		this.directorUserName = directorUserName;
-	}
-
-	public Date getExpectStartGroupDate() {
-		return expectStartGroupDate;
-	}
-
-	public void setExpectStartGroupDate(Date expectStartGroupDate) {
-		this.expectStartGroupDate = expectStartGroupDate;
-	}
-
-	public Integer getGroupMemberNum() {
-		return groupMemberNum;
-	}
-
-	public void setGroupMemberNum(Integer groupMemberNum) {
-		this.groupMemberNum = groupMemberNum;
-	}
-
-	public String getCooperationOrganName() {
-		return cooperationOrganName;
-	}
-
-	public void setCooperationOrganName(String cooperationOrganName) {
-		this.cooperationOrganName = cooperationOrganName;
-	}
-
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	public String getOrganName() {
-		return organName;
-	}
-
-	public void setOrganName(String organName) {
-		this.organName = organName;
-	}
-
-	public String getSchoolName() {
-		return schoolName;
-	}
-
-	public void setSchoolName(String schoolName) {
-		this.schoolName = schoolName;
-	}
-
-	public String getTeamTeacherName() {
-		return teamTeacherName;
-	}
-
-	public void setTeamTeacherName(String teamTeacherName) {
-		this.teamTeacherName = teamTeacherName;
-	}
-
-	public String getEducationalTeacherName() {
-		return educationalTeacherName;
-	}
-
-	public void setEducationalTeacherName(String educationalTeacherName) {
-		this.educationalTeacherName = educationalTeacherName;
-	}
-
-	public Integer getPayNum() {
-		return payNum;
-	}
-
-	public void setPayNum(Integer payNum) {
-		this.payNum = payNum;
-	}
-
-	public String getImg() {
-		return img;
-	}
-
-	public void setImg(String img) {
-		this.img = img;
-	}
-
-	public String getPaymentMonths() {
-		return paymentMonths;
-	}
-
-	public void setPaymentMonths(String paymentMonth) {
-		this.paymentMonths = paymentMonth;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
-	}
-	
-	public Integer getOrganId(){
-		return this.organId;
-	}
-			
-	public void setSchoolId(Integer schoolId){
-		this.schoolId = schoolId;
-	}
-	
-	public Integer getSchoolId(){
-		return this.schoolId;
-	}
-			
-	public void setApplyExpireDate(java.util.Date applyExpireDate){
-		this.applyExpireDate = applyExpireDate;
-	}
-	
-	public java.util.Date getApplyExpireDate(){
-		return this.applyExpireDate;
-	}
-			
-	public java.util.Date getPreApplyExpireDate() {
-		return preApplyExpireDate;
-	}
-
-	public void setPreApplyExpireDate(java.util.Date preApplyExpireDate) {
-		this.preApplyExpireDate = preApplyExpireDate;
-	}
-
-	public void setTeamTeacherId(Integer teamTeacherId){
-		this.teamTeacherId = teamTeacherId;
-	}
-	
-	public Integer getTeamTeacherId(){
-		return this.teamTeacherId;
-	}
-			
-	public void setEducationalTeacherId(Integer educationalTeacherId){
-		this.educationalTeacherId = educationalTeacherId;
-	}
-	
-	public Integer getEducationalTeacherId(){
-		return this.educationalTeacherId;
-	}
-			
-	public String getCourseForm() {
-		return courseForm;
-	}
-
-	public void setCourseForm(String courseForm) {
-		this.courseForm = courseForm;
-	}
-
-	public Integer getCooperationOrganId() {
-		return cooperationOrganId;
-	}
-
-	public void setCooperationOrganId(Integer cooperationOrganId) {
-		this.cooperationOrganId = cooperationOrganId;
-	}
-
-	public String getEnlightenmentCourseTime() {
-		return enlightenmentCourseTime;
-	}
-
-	public void setEnlightenmentCourseTime(String enlightenmentCourseTime) {
-		this.enlightenmentCourseTime = enlightenmentCourseTime;
-	}
-
-	public String getParentMeetingTime() {
-		return parentMeetingTime;
-	}
-
-	public void setParentMeetingTime(String parentMeetingTime) {
-		this.parentMeetingTime = parentMeetingTime;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-
-	public MusicGroupStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(MusicGroupStatusEnum status) {
-		this.status = status;
-	}
-
-	public void setPaymentExpireDate(java.util.Date paymentExpireDate){
-		this.paymentExpireDate = paymentExpireDate;
-	}
-	
-	public java.util.Date getPaymentExpireDate(){
-		return this.paymentExpireDate;
-	}
-			
-	public void setBillStartDate(java.util.Date billStartDate){
-		this.billStartDate = billStartDate;
-	}
-	
-	public java.util.Date getBillStartDate(){
-		return this.billStartDate;
-	}
-			
-	public Integer getImproventClassesNum() {
-		return improventClassesNum;
-	}
-
-	public void setImproventClassesNum(Integer improventClassesNum) {
-		this.improventClassesNum = improventClassesNum;
-	}
-
-	public String getEnrollClasses() {
-		return enrollClasses;
-	}
-
-	public void setEnrollClasses(String enrollClasses) {
-		this.enrollClasses = enrollClasses;
-	}
-
-	public YesOrNoEnum getIsExtraClass() {
-		return isExtraClass;
-	}
-
-	public void setIsExtraClass(YesOrNoEnum isExtraClass) {
-		this.isExtraClass = isExtraClass;
-	}
-
-	public Integer getDirectorUserId() {
-		return directorUserId;
-	}
-
-	public void setDirectorUserId(Integer directorUserId) {
-		this.directorUserId = directorUserId;
-	}
-
-	public Integer getOperatorUserId() {
-		return operatorUserId;
-	}
-
-	public void setOperatorUserId(Integer operatorUserId) {
-		this.operatorUserId = operatorUserId;
-	}
-
-	public SalarySettlementTypeEnum getSettlementType() {
-		return settlementType;
-	}
-
-	public void setSettlementType(SalarySettlementTypeEnum settlementType) {
-		this.settlementType = settlementType;
-	}
-
-	public boolean isClassroomLessons() {
-		return isClassroomLessons;
-	}
-
-	public void setClassroomLessons(boolean isClassroomLessons) {
-		this.isClassroomLessons = isClassroomLessons;
-	}
-
-	public boolean getIsClassroomLessons() {
-		return isClassroomLessons;
-	}
-
-	public void setIsClassroomLessons(boolean isClassroomLessons) {
-		this.isClassroomLessons = isClassroomLessons;
-	}
-
-
-
-	public String getMemo() {
-		return memo;
-	}
-
-	public void setMemo(String memo) {
-		this.memo = memo;
-	}
-
-	public OwnershipType getOwnershipType() {
-		return ownershipType;
-	}
-
-	public void setOwnershipType(OwnershipType ownershipType) {
-		this.ownershipType = ownershipType;
-	}
-
-	public Boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(Boolean delFlag) {
-		this.delFlag = delFlag;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-	public Boolean getHasVerifyMusicalList() {
-		return hasVerifyMusicalList;
-	}
-
-	public void setHasVerifyMusicalList(Boolean hasVerifyMusicalList) {
-		this.hasVerifyMusicalList = hasVerifyMusicalList;
-	}
-
-	public CourseViewTypeEnum getCourseViewType() {
-		return courseViewType;
-	}
-
-	public void setCourseViewType(CourseViewTypeEnum courseViewType) {
-		this.courseViewType = courseViewType;
-	}
-
-	public Boolean getIsRemedy() {
-		return isRemedy;
-	}
-
-	public void setIsRemedy(Boolean remedy) {
-		isRemedy = remedy;
-	}
-
-	public Boolean getIsShowRecordOfStudent() {
-		return isShowRecordOfStudent;
-	}
-
-	public void setIsShowRecordOfStudent(Boolean isShowRecordOfStudent) {
-		this.isShowRecordOfStudent = isShowRecordOfStudent;
-	}
-
-	public Integer getMusicalInstrumentsProvideStatus() {
-		return musicalInstrumentsProvideStatus;
-	}
-
-	public void setMusicalInstrumentsProvideStatus(Integer musicalInstrumentsProvideStatus) {
-		this.musicalInstrumentsProvideStatus = musicalInstrumentsProvideStatus;
-	}
-
-	public Boolean getMemberCourseShowFlag() {
-		return memberCourseShowFlag;
-	}
-
-	public void setMemberCourseShowFlag(Boolean memberCourseShowFlag) {
-		this.memberCourseShowFlag = memberCourseShowFlag;
-	}
-
-	public BigDecimal getChargeStandard() {
-		return chargeStandard;
-	}
-
-	public void setChargeStandard(BigDecimal chargeStandard) {
-		this.chargeStandard = chargeStandard;
-	}
-
-	public Boolean getIsGiveAccessories() {
-		return isGiveAccessories;
-	}
-
-	public void setIsGiveAccessories(Boolean isGiveAccessories) {
-		this.isGiveAccessories = isGiveAccessories;
-	}
-
-	public ClassGroupTypeEnum getExtracurricularTeacher() {
-		return extracurricularTeacher;
-	}
-
-	public void setExtracurricularTeacher(ClassGroupTypeEnum extracurricularTeacher) {
-		this.extracurricularTeacher = extracurricularTeacher;
-	}
-
-	public Date getFirstCourseStartTime() {
-		return firstCourseStartTime;
-	}
-
-	public void setFirstCourseStartTime(Date firstCourseStartTime) {
-		this.firstCourseStartTime = firstCourseStartTime;
-	}
-
-	public Integer getMusicGroupPlanMakingId() {
-		return musicGroupPlanMakingId;
-	}
-
-	public void setMusicGroupPlanMakingId(Integer musicGroupPlanMakingId) {
-		this.musicGroupPlanMakingId = musicGroupPlanMakingId;
-	}
-
-	public String getFirstRecruitGrade() {
-		return firstRecruitGrade;
-	}
-
-	public void setFirstRecruitGrade(String firstRecruitGrade) {
-		this.firstRecruitGrade = firstRecruitGrade;
-	}
-
-	public BigDecimal getDefaultChargeStandard() {
-		return defaultChargeStandard;
-	}
-
-	public void setDefaultChargeStandard(BigDecimal defaultChargeStandard) {
-		this.defaultChargeStandard = defaultChargeStandard;
-	}
-
-	public String getSingleTrainMinutes() {
-		return singleTrainMinutes;
-	}
-
-	public void setSingleTrainMinutes(String singleTrainMinutes) {
-		this.singleTrainMinutes = singleTrainMinutes;
-	}
-
-	public String getCoursePlan() {
-		return coursePlan;
-	}
-
-	public void setCoursePlan(String coursePlan) {
-		this.coursePlan = coursePlan;
-	}
-
-	public String getSaleActivityDesc() {
-		return saleActivityDesc;
-	}
-
-	public void setSaleActivityDesc(String saleActivityDesc) {
-		this.saleActivityDesc = saleActivityDesc;
-	}
-
-	public Integer getGraduateGrade() {
-		return graduateGrade;
-	}
-
-	public void setGraduateGrade(Integer graduateGrade) {
-		this.graduateGrade = graduateGrade;
-	}
-
-	public Integer getBasicStudentNum() {
-		return basicStudentNum;
-	}
-
-	public void setBasicStudentNum(Integer basicStudentNum) {
-		this.basicStudentNum = basicStudentNum;
-	}
-
-	public String getPaymentUserType() {
-		return paymentUserType;
-	}
-
-	public void setPaymentUserType(String paymentUserType) {
-		this.paymentUserType = paymentUserType;
-	}
-
-	public String getChargeMode() {
-		return chargeMode;
-	}
-
-	public void setChargeMode(String chargeMode) {
-		this.chargeMode = chargeMode;
-	}
 }

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

@@ -286,9 +286,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if (musicGroup.getEducationalTeacherId() != null) {
                 userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
             }
-            if (musicGroup.getTeamTeacherId() != null) {
-                userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-            }
             if (musicGroup.getDirectorUserId() != null) {
                 userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
             }
@@ -1050,7 +1047,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.findByClassId(groupId);
         Set<Integer> teacherIds = new HashSet<>();
         if (musicGroup != null) {
-            teacherIds.add(musicGroup.getTeamTeacherId());
             teacherIds.add(musicGroup.getEducationalTeacherId());
             teacherIds.add(musicGroup.getDirectorUserId());
         }
@@ -1079,9 +1075,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             List<ImUserModel> userModels = teacherDao.queryTeacherImModel(teacherIds, search);
             for (ImUserModel e : userModels) {
                 if (musicGroup != null) {
-                    if (musicGroup.getTeamTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTeamTeacherId()) {
-                        e.setTitle("运营主管");
-                    } else if (musicGroup.getEducationalTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getEducationalTeacherId()) {
+                    if (musicGroup.getEducationalTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getEducationalTeacherId()) {
                         e.setTitle("乐团主管");
                     } else if (musicGroup.getDirectorUserId() != null && Integer.parseInt(e.getId()) == musicGroup.getDirectorUserId()) {
                         e.setTitle("乐队指导");
@@ -3832,9 +3826,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (musicGroup.getEducationalTeacherId() != null) {
             userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
         }
-        if (musicGroup.getTeamTeacherId() != null) {
-            userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-        }
         if (musicGroup.getDirectorUserId() != null) {
             userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
         }
@@ -3878,7 +3869,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         for (ClassGroupImGroupDto classGroupImGroupDto : classGroupImGroupList) {
             List<Integer> userIdList = new ArrayList<>();
             userIdList.add(musicGroup.getEducationalTeacherId());
-            userIdList.add(musicGroup.getTeamTeacherId());
             userIdList.add(musicGroup.getOperatorUserId());
             userIdList.add(musicGroup.getDirectorUserId());
             if (classGroupImGroupDto.getUserIds() != null && classGroupImGroupDto.getUserIds().size() > 0) {
@@ -4063,11 +4053,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public Map<String, Object> getUserInfoWithUserId(Integer groupId, Integer userId) {
         MusicGroup musicGroup = musicGroupDao.findByClassId(groupId);
         SysUser user = teacherDao.getUser(userId);
-        Map<String, Object> map = new HashMap<>(4);
+        Map<String, Object> map = new HashMap<>(3);
         if (musicGroup != null) {
-            if (musicGroup.getTeamTeacherId() != null && userId.equals(musicGroup.getTeamTeacherId())) {
-                map.put("name", user.getRealName() + "(运营主管)");
-            } else if (musicGroup.getEducationalTeacherId() != null && userId.equals(musicGroup.getEducationalTeacherId())) {
+            if (musicGroup.getEducationalTeacherId() != null && userId.equals(musicGroup.getEducationalTeacherId())) {
                 map.put("name", user.getRealName() + "(教务老师)");
             } else if (musicGroup.getDirectorUserId() != null && userId.equals(musicGroup.getDirectorUserId())) {
                 map.put("name", user.getRealName() + "(乐队指导)");

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

@@ -79,9 +79,6 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 			if(musicGroup.getEducationalTeacherId() != null){
 				userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
 			}
-			if(musicGroup.getTeamTeacherId() != null){
-				userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-			}
 			if(musicGroup.getDirectorUserId() != null){
 				userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
 			}

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

@@ -435,7 +435,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         }
 
         // 乐团主管
-        List<Integer> groupLeaderIds = musicGroupList.stream().map(MusicGroup::getTeamTeacherId).collect(Collectors.toList());
+        List<Integer> groupLeaderIds = musicGroupList.stream().map(MusicGroup::getEducationalTeacherId).collect(Collectors.toList());
 
         // 乐团ID集合
         List<String> musicGroupIds = musicGroupList.stream().map(MusicGroup::getId).collect(Collectors.toList());

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

@@ -342,7 +342,6 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
             musicGroup = musicGroupDao.get(musicGroupId);
             educationIds.add(musicGroup.getDirectorUserId());
             educationIds.add(musicGroup.getEducationalTeacherId());
-            educationIds.add(musicGroup.getTeamTeacherId());
             if(musicGroup.getRepairUserId() != null){
                 repairUserId = musicGroup.getRepairUserId();
                 repairUserName = teacherDao.queryNameById(repairUserId);

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

@@ -1027,9 +1027,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
         Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
 
-        if (musicGroup.getTeamTeacherId() != null) {
-            userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-        }
         if (musicGroup.getEducationalTeacherId() != null) {
             userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
         }

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

@@ -1959,7 +1959,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             musicGroups.forEach(e -> {
                 teacherIds.add(e.getDirectorUserId());
                 teacherIds.add(e.getEducationalTeacherId());
-                teacherIds.add(e.getTeamTeacherId());
             });
         }
         //获取相关vip课老师列表
@@ -3546,9 +3545,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             return;
         }
         List<Integer> quitUserIdList = new ArrayList<>();
-        if (oldMusicGroup.getTeamTeacherId() != null) {
-            quitUserIdList.add(oldMusicGroup.getTeamTeacherId());
-        }
         if (oldMusicGroup.getEducationalTeacherId() != null) {
             quitUserIdList.add(oldMusicGroup.getEducationalTeacherId());
         }
@@ -3558,10 +3554,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (oldMusicGroup.getTransactionTeacherId() != null) {
             quitUserIdList.add(oldMusicGroup.getTransactionTeacherId());
         }
-        Map<Integer, String> userRoleMap = new HashMap<>(4);
-        if (newMusicGroup.getTeamTeacherId() != null) {
-            userRoleMap.put(newMusicGroup.getTeamTeacherId(), "运营主管");
-        }
+        Map<Integer, String> userRoleMap = new HashMap<>(3);
         if (newMusicGroup.getEducationalTeacherId() != null) {
             userRoleMap.put(newMusicGroup.getEducationalTeacherId(), "乐团主管");
         }
@@ -3625,9 +3618,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (imGroup != null) {
                 refresh = true;
                 List<Integer> quitUserIdList = new ArrayList<>();
-                if (group.getTeamTeacherId() != null) {
-                    quitUserIdList.add(group.getTeamTeacherId());
-                }
                 if (group.getEducationalTeacherId() != null) {
                     quitUserIdList.add(group.getEducationalTeacherId());
                 }
@@ -3637,10 +3627,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (group.getTransactionTeacherId() != null) {
                     quitUserIdList.add(group.getTransactionTeacherId());
                 }
-                Map<Integer, String> userRoleMap = new HashMap<>(4);
-                if (musicGroup.getTeamTeacherId() != null) {
-                    userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-                }
+                Map<Integer, String> userRoleMap = new HashMap<>(3);
                 if (musicGroup.getEducationalTeacherId() != null) {
                     userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
                 }
@@ -3791,7 +3778,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("乐团信息不存在");
         }
         musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
-        musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
         musicGroup.setDirectorUserName(teacherDao.queryNameById(musicGroup.getDirectorUserId()));
         musicGroup.setRepairUserName(teacherDao.queryNameById(musicGroup.getRepairUserId()));
         Organization organization = organizationDao.get(musicGroup.getOrganId());

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

@@ -286,7 +286,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
             Set<Integer> teacherIdSet = new HashSet<>();
             if (musicGroupList != null && musicGroupList.size() > 0) {
                 musicGroupList.forEach(e -> {
-                    teacherIdSet.add(e.getTeamTeacherId());
                     teacherIdSet.add(e.getEducationalTeacherId());
                     teacherIdSet.add(e.getDirectorUserId());
                 });
@@ -329,7 +328,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
             musicGroups.forEach(e -> {
                 teacherIds.add(e.getDirectorUserId());
                 teacherIds.add(e.getEducationalTeacherId());
-                teacherIds.add(e.getTeamTeacherId());
             });
         }
         //获取相关vip课老师列表
@@ -374,7 +372,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
             Set<Integer> teacherIdSet = new HashSet<>();
             if (musicGroupList != null && musicGroupList.size() > 0) {
                 musicGroupList.forEach(e -> {
-                    teacherIdSet.add(e.getTeamTeacherId());
                     teacherIdSet.add(e.getEducationalTeacherId());
                     teacherIdSet.add(e.getDirectorUserId());
                 });

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

@@ -9,7 +9,6 @@
         <result column="school_id_" property="schoolId"/>
         <result column="apply_expire_date_" property="applyExpireDate"/>
         <result column="pre_apply_expire_date_" property="preApplyExpireDate"/>
-        <result column="team_teacher_id_" property="teamTeacherId"/>
         <result column="educational_teacher_id_" property="educationalTeacherId"/>
         <result column="transaction_teacher_id_" property="transactionTeacherId"/>
         <result column="course_form_" property="courseForm"/>
@@ -66,7 +65,6 @@
         <result column="school_name_" property="schoolName"/>
         <result column="charge_type_name_" property="chargeTypeName"/>
         <result column="cooperation_organ_name_" property="cooperationOrganName"/>
-        <result column="team_teacher_name_" property="teamTeacherName"/>
         <result column="edu_teacher_name_" property="educationalTeacherName"/>
         <result column="teans_teacher_name_" property="transactionTeacherName"/>
         <result column="teans_teacher_phone_" property="transactionTeacherPhone"/>
@@ -91,11 +89,11 @@
     <select id="queryBasicInfo" resultMap="MusicGroupBasicDto">
         SELECT mg.*,o.name_ organ_name_,s.name_ school_name_ ,co.name_ cooperation_organ_name_,
         u1.real_name_ edu_teacher_name_,u2.real_name_ teans_teacher_name_,u2.phone_ teans_teacher_phone_,
-        u3.real_name_ team_teacher_name_,u4.real_name_ dir_teacher_name_,u5.real_name_ repair_teacher_name_
+        u4.real_name_ dir_teacher_name_,u5.real_name_ repair_teacher_name_
         FROM music_group mg left join organization o on mg.organ_id_ = o.id_
         left join school s on mg.school_id_ = s.id_ left join cooperation_organ co on co.id_ = mg.cooperation_organ_id_
         left join sys_user u1 on u1.id_ = mg.educational_teacher_id_
-        left join sys_user u2 on u2.id_ = mg.transaction_teacher_id_ left join sys_user u3 on u3.id_ = mg.team_teacher_id_
+        left join sys_user u2 on u2.id_ = mg.transaction_teacher_id_
         left join sys_user u4 on u4.id_ = mg.director_user_id_ left join sys_user u5 on u5.id_ = mg.repair_user_id_
         WHERE mg.id_ = #{id}
     </select>
@@ -111,7 +109,7 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroup"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group
-                (id_, name_, organ_id_, school_id_, apply_expire_date_, pre_apply_expire_date_, team_teacher_id_,
+                (id_, name_, organ_id_, school_id_, apply_expire_date_, pre_apply_expire_date_,
                  educational_teacher_id_,
                  course_form_, create_time_, update_time_, status_,
                  bill_start_date_, improvent_classes_num_, enroll_classes_, payment_expire_date_, is_extra_class_,
@@ -120,7 +118,7 @@
                  ownership_type_, repair_user_id_, del_flag_, payment_valid_start_date_, payment_valid_end_date_,
                  payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_,is_give_accessories_,extracurricular_teacher_,first_course_start_time_,
                  music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_,basic_student_num_,payment_user_type_,charge_mode_,grade_type_)
-        VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
+        VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate},
                 #{educationalTeacherId},
                 #{courseForm}, now(), now(),
                 #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{billStartDate},
@@ -207,7 +205,7 @@
                 enlightenment_course_time_ = #{enlightenmentCourseTime},
             </if>
             <if test="teamTeacherId != null">
-                team_teacher_id_ = #{teamTeacherId},director_user_id_ = #{directorUserId},
+                director_user_id_ = #{directorUserId},
             </if>
             <if test="parentMeetingTime != null">
                 parent_meeting_time_ = #{parentMeetingTime},
@@ -489,7 +487,7 @@
         FROM music_group mg
         LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
         LEFT JOIN class_group_teacher_mapper cgtm ON cg.id_ = cgtm.class_group_id_
-        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId}
+        WHERE (cgtm.user_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId}
         OR director_user_id_ = #{userId}) AND mg.status_ IN ('PROGRESS','PAUSE')
         <if test="search != null and search != ''">
             AND mg.name_ LIKE CONCAT('%',#{search},'%')