update

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

@@ -186,6 +186,14 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     Set<Integer> queryTeacherIds(String id);
 
     /**
+     * 获取当前班级老师数量
+     *
+     * @param classGroupId
+     * @return
+     */
+    Integer countTeacherNum(String classGroupId);
+
+    /**
      * 获取老师所在班级群组列表
      *
      * @param userId
@@ -201,4 +209,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<ClassGroup> findNoClassSubjects(String musicGroupId);
+
+    /**
+     * 获取当前班级列表老师数量
+     * @param classGroupIds
+     * @return
+     */
+    List<Map<Integer, Integer>> countTeacherNums(@Param("classGroupIds") String classGroupIds);
 }

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

@@ -9,6 +9,7 @@ import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -65,7 +66,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param musicGroupIds
      * @return
      */
-    List<Map<String,Integer>> countMusicGroupUserNum(Set<String> musicGroupIds);
+    List<Map<String, BigDecimal>> countMusicGroupUserNum(@Param("musicGroupIds") Set<String> musicGroupIds);
 
     /**
      * 获取乐团所有学员基本信息

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

@@ -32,7 +32,7 @@ public interface StudentManageDao {
      * @Date: 2019/9/20
      * 根据学生ID获取该学院基本信息
      */
-    StudentManageBaseDto findStudentBaseInfoByUserID(Long userID);
+    StudentManageListDto findStudentBaseInfoByUserID(Integer userId);
 
     /**
      * @Author: Joburgess
@@ -46,7 +46,7 @@ public interface StudentManageDao {
      * @Date: 2019/9/20
      * 根据学生ID获取其所在的乐团
      */
-    List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Long userID);
+    List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Integer userId);
 
     /**
      * @Author: Joburgess
@@ -81,6 +81,6 @@ public interface StudentManageDao {
      * @Date: 2019/9/21
      * 获取学上账户基本信息
      */
-    StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Long userID);
+    StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Integer userId);
 
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.dto.UserGoodsDto;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.entity.Goods;
@@ -64,4 +65,12 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @return
      */
     int findPayOrderNum();
+
+    /**
+     * 获取学员报名时所购买的商品
+     * @param musicGroupId
+     * @param userId
+     * @return
+     */
+    List<UserGoodsDto> findGoodsIds(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 }

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

@@ -75,7 +75,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @return java.util.List<com.ym.mec.biz.dal.dto.StudentManageVipGroupDto>
 	 * @describe 获取对应学生vip课
 	 */
-	List<StudentManageVipGroupDto> findStudentVipGroups(Long userID);
+	List<StudentManageVipGroupDto> findStudentVipGroups(Integer userId);
 
 	/**
 	 * @Author: Joburgess

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

@@ -1,46 +0,0 @@
-package com.ym.mec.biz.dal.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2019/9/20
- */
-public class StudentManageBaseDto extends StudentManageListDto {
-
-    @ApiModelProperty(value = "生日",required = false)
-    private Date birthdate;
-
-    @ApiModelProperty(value = "家长姓名",required = false)
-    private String parentName;
-
-    @ApiModelProperty(value = "乐团列表",required = false)
-    private List<StudentManageBaseInfoOfMusicGroupDto> musicGroups;
-
-    public List<StudentManageBaseInfoOfMusicGroupDto> getMusicGroups() {
-        return musicGroups;
-    }
-
-    public void setMusicGroups(List<StudentManageBaseInfoOfMusicGroupDto> musicGroups) {
-        this.musicGroups = musicGroups;
-    }
-
-    public Date getBirthdate() {
-        return birthdate;
-    }
-
-    public void setBirthdate(Date birthdate) {
-        this.birthdate = birthdate;
-    }
-
-    public String getParentName() {
-        return parentName;
-    }
-
-    public void setParentName(String parentName) {
-        this.parentName = parentName;
-    }
-}

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

@@ -1,9 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
@@ -15,8 +17,11 @@ import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
  */
 public class StudentManageBaseInfoOfMusicGroupDto {
 
+    @ApiModelProperty(value = "userId",required = false)
+    private Integer userId;
+
     @ApiModelProperty(value = "乐团ID",required = false)
-    private Long musicGroupId;
+    private String musicGroupId;
 
     @ApiModelProperty(value = "乐团名称",required = false)
     private String musicGroupName;
@@ -24,11 +29,14 @@ public class StudentManageBaseInfoOfMusicGroupDto {
     @ApiModelProperty(value = "乐团状态（报名中、缴费中、筹备中、进行中、取消）",required = false)
     private MusicGroupStatusEnum musicGroupStatus;
 
+    @ApiModelProperty(value = "用户所在乐团状态）",required = false)
+    private ClassGroupStudentStatusEnum userMusicGroupStatus;
+
     @ApiModelProperty(value = "加入乐团时间",required = false)
     private Date joinMusicGroupDate;
 
     @ApiModelProperty(value = "科目ID",required = false)
-    private Long subjectId;
+    private Integer subjectId;
 
     @ApiModelProperty(value = "科目名称",required = false)
     private String subjectName;
@@ -36,53 +44,50 @@ public class StudentManageBaseInfoOfMusicGroupDto {
     @ApiModelProperty(value = "器材购买方式（团购、自备）",required = false)
     private KitPurchaseMethodEnum kitPurchaseMethod;
 
-    @ApiModelProperty(value = "商品ID列表",required = false)
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private String goodsIdList;
-
-    @ApiModelProperty(value = "商品名称列表",required = false)
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private String[] goodsNameList;
+    @ApiModelProperty(value = "商品列表",required = false)
+    private List<UserGoodsDto> userGoodsDtos;
 
-    @ApiModelProperty(value = "打包价格",required = false)
+    @ApiModelProperty(value = "价格",required = false)
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    private BigDecimal price;
+    private BigDecimal depositFee;
 
-    @ApiModelProperty(value = "部门ID",required = false)
-    private Long organId;
+    public List<UserGoodsDto> getUserGoodsDtos() {
+        return userGoodsDtos;
+    }
 
-    @ApiModelProperty(value = "部门名称",required = false)
-    private String organName;
+    public void setUserGoodsDtos(List<UserGoodsDto> userGoodsDtos) {
+        this.userGoodsDtos = userGoodsDtos;
+    }
 
-    public Long getOrganId() {
-        return organId;
+    public Integer getUserId() {
+        return userId;
     }
 
-    public void setOrganId(Long organId) {
-        this.organId = organId;
+    public void setUserId(Integer userId) {
+        this.userId = userId;
     }
 
-    public String getOrganName() {
-        return organName;
+    public ClassGroupStudentStatusEnum getUserMusicGroupStatus() {
+        return userMusicGroupStatus;
     }
 
-    public void setOrganName(String organName) {
-        this.organName = organName;
+    public void setUserMusicGroupStatus(ClassGroupStudentStatusEnum userMusicGroupStatus) {
+        this.userMusicGroupStatus = userMusicGroupStatus;
     }
 
-    public String[] getGoodsNameList() {
-        return goodsNameList;
+    public BigDecimal getDepositFee() {
+        return depositFee;
     }
 
-    public void setGoodsNameList(String[] goodsNameList) {
-        this.goodsNameList = goodsNameList;
+    public void setDepositFee(BigDecimal depositFee) {
+        this.depositFee = depositFee;
     }
 
-    public Long getMusicGroupId() {
+    public String getMusicGroupId() {
         return musicGroupId;
     }
 
-    public void setMusicGroupId(Long musicGroupId) {
+    public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
 
@@ -110,11 +115,11 @@ public class StudentManageBaseInfoOfMusicGroupDto {
         this.joinMusicGroupDate = joinMusicGroupDate;
     }
 
-    public Long getSubjectId() {
+    public Integer getSubjectId() {
         return subjectId;
     }
 
-    public void setSubjectId(Long subjectId) {
+    public void setSubjectId(Integer subjectId) {
         this.subjectId = subjectId;
     }
 
@@ -133,20 +138,4 @@ public class StudentManageBaseInfoOfMusicGroupDto {
     public void setKitPurchaseMethod(KitPurchaseMethodEnum kitPurchaseMethod) {
         this.kitPurchaseMethod = kitPurchaseMethod;
     }
-
-    public String getGoodsIdList() {
-        return goodsIdList;
-    }
-
-    public void setGoodsIdList(String goodsIdList) {
-        this.goodsIdList = goodsIdList;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
 }

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

@@ -3,6 +3,9 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.common.enums.UserGenderEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/19
@@ -24,6 +27,39 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "家长名字",required = false)
     private String parentsName;
 
+    @ApiModelProperty(value = "生日",required = false)
+    private Date birthdate;
+
+    @ApiModelProperty(value = "班级",required = false)
+    private String currentClass;
+
+    @ApiModelProperty(value = "年级",required = false)
+    private String currentGrade;
+
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
+    public String getCurrentGrade() {
+        return currentGrade;
+    }
+
+    public void setCurrentGrade(String currentGrade) {
+        this.currentGrade = currentGrade;
+    }
+
+    public Date getBirthdate() {
+        return birthdate;
+    }
+
+    public void setBirthdate(Date birthdate) {
+        this.birthdate = birthdate;
+    }
+
     public UserGenderEnum getGender() {
         return gender;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
@@ -74,12 +75,23 @@ public class StudentRegistration {
     @ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）", hidden = true)
     private YesOrNoEnum paymentStatus;
 
+    @ApiModelProperty(value = "用户所在乐团状态）",required = false)
+    private ClassGroupStudentStatusEnum musicGroupStatus;
+
     @ApiModelProperty(value = "班级id", hidden = true)
     private Integer classGroupId;
 
     @ApiModelProperty(value = "零时课程费用", hidden = true)
     private BigDecimal temporaryCourseFee;
 
+    public ClassGroupStudentStatusEnum getMusicGroupStatus() {
+        return musicGroupStatus;
+    }
+
+    public void setMusicGroupStatus(ClassGroupStudentStatusEnum musicGroupStatus) {
+        this.musicGroupStatus = musicGroupStatus;
+    }
+
     public BigDecimal getTemporaryCourseFee() {
         return temporaryCourseFee;
     }

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

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
  * 班级类型(普通班级、合奏班级)
  */
 public enum ClassGroupStudentStatusEnum implements BaseEnum<String, ClassGroupStudentStatusEnum> {
-	NORMAL("NORMAL", "在读"), LEAVE("LEAVE", "请假"), QUIT("QUIT", "退学");
+	NORMAL("NORMAL", "在读"), LEAVE("LEAVE", "请假"), QUIT("QUIT", "退团");
 
 	private String code;
 

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

@@ -1,9 +1,6 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto;
-import com.ym.mec.biz.dal.dto.StudentManageBaseDto;
-import com.ym.mec.biz.dal.dto.StudentManageBaseInfoOfMusicGroupDto;
-import com.ym.mec.biz.dal.dto.StudentManageVipGroupDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.page.StudentManageAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.StudentManageCourseQueryInfo;
 import com.ym.mec.biz.dal.page.StudentManageQueryInfo;
@@ -29,14 +26,14 @@ public interface StudentManageService {
      * @Date: 2019/9/20
      * 根据学生ID获取学生基本报名信息
      */
-    StudentManageBaseDto findStudentManageBaseInfo(Long userID);
+    StudentManageListDto findStudentManageBaseInfo(Integer userId);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/20
      * 根据学生ID获取其所在的乐团
      */
-    List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Long userID);
+    List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Integer userId);
 
     /**
      * @Author: Joburgess
@@ -57,13 +54,13 @@ public interface StudentManageService {
      * @Date: 2019/9/20
      * 获取学生vip课
      */
-    List<StudentManageVipGroupDto> findStudentVipGroups(Long userID);
+    List<StudentManageVipGroupDto> findStudentVipGroups(Integer userID);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/21
      * 获取学上账户基本信息
      */
-    StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Long userID);
+    StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Integer userID);
 
 }

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -334,19 +335,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public List<ImGroupModel> queryUserGroups(Integer userId, String search) {
         List<ImGroupModel> imGroupModels = musicGroupDao.queryUserGroups(userId, search);
-        Set<String> musicGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
-
-        List<ImGroupModel> imGroupModels1 = classGroupDao.queryUserGroups(userId, search);
 
         if (imGroupModels != null && imGroupModels.size() > 0) {
+            //获取相关的所有乐团
+            Set<String> musicGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             List<MusicGroup> musicGroups = musicGroupDao.queryListByIds(musicGroupIds);
 
-            List<Map<String, Integer>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(musicGroupIds);
-            Map<String, Integer> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
+            //获取乐团群用户总数map
+            List<Map<String, BigDecimal>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(musicGroupIds);
+            Map<String, BigDecimal> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
             imGroupModels.forEach(e -> {
                 MusicGroup musicGroup = musicGroups.stream().filter(mg -> mg.getId().equals(e.getId())).findFirst().get();
-                //获取创建乐团的老师
-//                MusicGroup musicGroup = musicGroupDao.get(e.getId());
                 //获取教学老师id列表
                 Set<Integer> teachers = musicGroupDao.queryTeacherIds(e.getId());
                 teachers.add(musicGroup.getTeamTeacherId());
@@ -355,18 +354,22 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 teachers.add(musicGroup.getDirectorUserId());
                 teachers.removeAll(Collections.singleton(null));
                 //获取乐团群用户总数
-                e.setCount(musicGroupUserNumMap.get(e.getId()) + teachers.size());
+                BigDecimal count = musicGroupUserNumMap.get(e.getId());
+                e.setCount(count == null?0:count.intValue() + teachers.size());
                 e.setId("mg" + e.getId());
             });
         } else {
             imGroupModels = new ArrayList<>();
         }
+        List<ImGroupModel> imGroupModels1 = classGroupDao.queryUserGroups(userId, search);
         if (imGroupModels1 != null && imGroupModels1.size() > 0) {
+            Set<String> classGroupIds = imGroupModels1.stream().map(e -> e.getId()).collect(Collectors.toSet());
+            //获取班级老师总数map
+            List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds,","));
+            Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
             imGroupModels1.forEach(e -> {
-                //获取当前班级老师总数
-                Set<Integer> teachers = classGroupDao.queryTeacherIds(e.getId());
-                teachers.removeAll(Collections.singleton(null));
-                e.setCount(e.getCount() + teachers.size());
+                Integer num = numsMap.get(e.getId());
+                e.setCount(num == null?0:num + e.getCount());
                 e.setId("cg" + e.getId());
             });
             imGroupModels.addAll(imGroupModels1);

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.StudentManageDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.VipGroupDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.page.StudentManageAttendanceQueryInfo;
@@ -29,6 +30,8 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Autowired
     private StudentManageDao studentManageDao;
     @Autowired
+    private StudentPaymentOrderDao studentPaymentOrderDao;
+    @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private VipGroupDao vipGroupDao;
@@ -56,18 +59,20 @@ public class StudentManageServiceImpl implements StudentManageService {
     }
 
     @Override
-    public StudentManageBaseDto findStudentManageBaseInfo(Long userID) {
-        StudentManageBaseDto studentManageBaseDto = studentManageDao.findStudentBaseInfoByUserID(userID);
-        for(int i=0;i<studentManageBaseDto.getMusicGroups().size();i++){
-            String[] goodsIdList=studentManageBaseDto.getMusicGroups().get(i).getGoodsIdList().split("\\|");
-            studentManageBaseDto.getMusicGroups().get(i).setGoodsNameList(studentManageDao.findGoodsNamesByIds(goodsIdList));
-        }
-        return studentManageBaseDto;
+    public StudentManageListDto findStudentManageBaseInfo(Integer userId) {
+        return studentManageDao.findStudentBaseInfoByUserID(userId);
     }
 
     @Override
-    public List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Long userID) {
-        return studentManageDao.findStudentMusicGroupsByUserId(userID);
+    public List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Integer userId) {
+        List<StudentManageBaseInfoOfMusicGroupDto> musicGroups = studentManageDao.findStudentMusicGroupsByUserId(userId);
+        //获取学员报名时所选乐器
+        if(musicGroups != null && musicGroups.size() > 0){
+            for (StudentManageBaseInfoOfMusicGroupDto e:musicGroups) {
+                e.setUserGoodsDtos(studentPaymentOrderDao.findGoodsIds(e.getMusicGroupId(),e.getUserId()));
+            }
+        }
+        return musicGroups;
     }
 
     @Override
@@ -111,12 +116,12 @@ public class StudentManageServiceImpl implements StudentManageService {
     }
 
     @Override
-    public List<StudentManageVipGroupDto> findStudentVipGroups(Long userID) {
-        return vipGroupDao.findStudentVipGroups(userID);
+    public List<StudentManageVipGroupDto> findStudentVipGroups(Integer userId) {
+        return vipGroupDao.findStudentVipGroups(userId);
     }
 
     @Override
-    public StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Long userID) {
-        return studentManageDao.getStudentAccountBaseInfo(userID);
+    public StudentManageAccountBaseInfoDto getStudentAccountBaseInfo(Integer userId) {
+        return studentManageDao.getStudentAccountBaseInfo(userId);
     }
 }

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

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -102,20 +103,15 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	public List<ImGroupModel> queryTeacherGroups(Integer userId,String search) {
 		//获取教师所在乐团列表
 		List<ImGroupModel> imGroupModels =  musicGroupDao.queryTeacherGroups(userId,search);
-		//获取教师所在班级列表
-		List<ImGroupModel> imGroupModels1 =  classGroupDao.queryTeacherGroups(userId,search);
-
 
-//		musicGroupDao.countMusicGroupUserNum();
 		if(imGroupModels != null && imGroupModels.size() > 0){
+			//获取乐团id列表
 			Set<String> musicGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			List<MusicGroup> musicGroups = musicGroupDao.queryListByIds(musicGroupIds);
-			List<Map<String, Integer>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(musicGroupIds);
-			Map<String, Integer> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
+			List<Map<String, BigDecimal>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(musicGroupIds);
+			Map<String, BigDecimal> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
 			imGroupModels.forEach(e -> {
 				MusicGroup musicGroup = musicGroups.stream().filter(mg -> mg.getId().equals(e.getId())).findFirst().get();
-				//获取创建乐团的老师
-//				MusicGroup musicGroup = musicGroupDao.get(e.getId());
 				//获取教学老师id列表
 				Set<Integer> teachers = musicGroupDao.queryTeacherIds(e.getId());
 				teachers.add(musicGroup.getTeamTeacherId());
@@ -124,21 +120,26 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 				teachers.add(musicGroup.getDirectorUserId());
 				teachers.removeAll(Collections.singleton(null));
 				//获取乐团群用户总数
-				Integer count = musicGroupUserNumMap.get(e.getId());
-//				Integer count = musicGroupDao.countMusicGroupUserNum(e.getId());
-				int num = count == null?0:count;
-				e.setCount(teachers.size() + num);
+				BigDecimal count = musicGroupUserNumMap.get(e.getId());
+				e.setCount(count == null?0:count.intValue() + teachers.size());
 				e.setId("mg" + e.getId());
 			});
 		}else {
 			imGroupModels = new ArrayList<>();
 		}
+		//获取教师所在班级列表
+		List<ImGroupModel> imGroupModels1 =  classGroupDao.queryTeacherGroups(userId,search);
 		if(imGroupModels1 != null && imGroupModels1.size() > 0){
+			Set<String> classGroupIds = imGroupModels1.stream().map(e -> e.getId()).collect(Collectors.toSet());
+			//获取班级老师总数map
+			List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds,","));
+			Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
 			imGroupModels1.forEach(e -> {
 				//获取当前班级老师总数
-				Set<Integer> teachers = classGroupDao.queryTeacherIds(e.getId());
-				teachers.removeAll(Collections.singleton(null));
-				e.setCount(e.getCount() + teachers.size());
+//				Set<Integer> teachers = classGroupDao.queryTeacherIds(e.getId());
+//				teachers.removeAll(Collections.singleton(null));
+				Integer num = numsMap.get(e.getId());
+				e.setCount(num == null?0:num + e.getCount());
 				e.setId("cg" + e.getId());
 			});
 			imGroupModels.addAll(imGroupModels1);

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

@@ -130,33 +130,25 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ClassGroup" parameterType="map">
-        SELECT * FROM class_group ORDER BY id_
+        SELECT * FROM class_group where del_flag_ = 0 ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM class_group
+        SELECT COUNT(*) FROM class_group where del_flag_ = 0
     </select>
 
     <!-- 查询根据主教助教查询班级信息 -->
     <select id="findClassGroup4Teacher" resultMap="ClassGroup4Teacher">
-        SELECT
-        c.*,
-        m.*
-        FROM
-        class_group c,
-        music_group m
+        SELECT c.*,m.* FROM
+        class_group c, music_group m
         WHERE
-        c.main_teacher_id_ = #{teacherId}
-        OR
-        c.assistant_teacher_id_ = #{teacherId}
+        (c.main_teacher_id_ = #{teacherId} OR c.assistant_teacher_id_ = #{teacherId})
+        AND c.del_flag_ = 0
     </select>
     <select id="findAllMixClassGroup" resultMap="ClassGroup">
-        SELECT
-        *
-        FROM
+        SELECT * FROM
         class_group cg
         WHERE cg.type_="MIX" AND cg.music_group_id_=#{musicGroupId} AND del_flag_='0'
     </select>
@@ -191,7 +183,7 @@
 
     <!-- 根据ids查询班级列表 -->
     <select id="findClassGroupByIds" resultMap="ClassGroup">
-        SELECT * FROM class_group WHERE FIND_IN_SET(id_,#{ids})
+        SELECT * FROM class_group WHERE FIND_IN_SET(id_,#{ids}) AND del_flag_ = 0
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto" id="getTeaCourseInfosMap">
@@ -209,7 +201,7 @@
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
-        WHERE cgtm.user_id_ = #{userId}
+        WHERE cgtm.user_id_ = #{userId} AND cg.del_flag_ = 0
     </select>
 
 
@@ -264,7 +256,7 @@
         <if test="type !=null and type !=''">
         AND FIND_IN_SET(type_,#{type})
         </if>
-        AND del_flag_ = 0;
+        AND del_flag_ = 0
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
@@ -313,8 +305,9 @@
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         <where>
+            cg.del_flag_ = 0
             <if test="userId != null">
-                cgsm.user_id_ = #{userId}
+                AND cgsm.user_id_ = #{userId}
             </if>
             <if test="search != null and search != ''">
                 AND cg.name_ LIKE CONCAT('%',#{search},'%')
@@ -415,7 +408,7 @@
     <select id="queryTeacherGroups" resultMap="imGroupModel">
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_ FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
-        WHERE cgtm.user_id_ = #{userId}
+        WHERE cgtm.user_id_ = #{userId} AND cg.del_flag_ = 0
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>
@@ -426,7 +419,18 @@
         (SELECT cgr.sub_class_group_id_ FROM class_group_relation cgr
         LEFT JOIN class_group cg ON cg.id_ = cgr.class_group_id_
         WHERE cg.music_group_id_ = #{musicGroupId})
-        AND cg.music_group_id_ = #{musicGroupId} AND type_ = 'NORMAL'
+        AND cg.music_group_id_ = #{musicGroupId} AND type_ = 'NORMAL' AND cg.del_flag_ = 0
+    </select>
+
+    <select id="countTeacherNum" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT cgtm.user_id_) FROM class_group_teacher_mapper cgtm
+        WHERE cgtm.class_group_id_ = #{classGroupId}
+    </select>
+
+    <select id="countTeacherNums" resultType="java.util.Map">
+        SELECT COUNT(DISTINCT cgtm.user_id_) `value`,cgtm.class_group_id_ `key`
+        FROM class_group_teacher_mapper cgtm
+        WHERE FIND_IN_SET(cgtm.class_group_id_,#{classGroupIds}) GROUP BY cgtm.class_group_id_
     </select>
 
     <!-- 增加实际学生人数 -->

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

@@ -49,7 +49,7 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group
 		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,
-		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_)
+		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_,)
 		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
 		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
 		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId})
@@ -223,7 +223,7 @@
 		</where>
 	</select>
 
-    <select id="countMusicGroupUserNum" resultType="map">
+    <select id="countMusicGroupUserNum" resultType="map" parameterType="list">
 		SELECT SUM(student_num_) 'value',music_group_id_ 'key' FROM class_group
 		WHERE music_group_id_ IN
 		<foreach item="item" index="index" collection="musicGroupIds" open="(" separator="," close=")">
@@ -266,7 +266,7 @@
 		AND cgsm.status_ != 'QUIT' GROUP BY cg.music_group_id_
 	</select>
 
-    <select id="queryListByIds" resultMap="MusicGroup">
+    <select id="queryListByIds" resultMap="MusicGroup" parameterType="list">
 		SELECT * FROM music_group WHERE id_ IN
 		<foreach item="item" index="index" collection="musicGroupIds" open="(" separator="," close=")">
 			#{item}

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

@@ -7,27 +7,11 @@
         <result property="realName" column="real_name_"/>
         <result property="parentsPhone" column="parents_phone_"/>
         <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="parentsName" column="school_id_"/>
-    </resultMap>
-
-    <resultMap id="musicGroup" type="com.ym.mec.biz.dal.dto.StudentManageBaseInfoOfMusicGroupDto">
-        <result property="musicGroupId" column="music_group_id_"/>
-        <result property="musicGroupName" column="music_group_name_"/>
-        <result property="musicGroupStatus" column="music_group_status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="joinMusicGroupDate" column="join_date"/>
-        <result property="subjectId" column="subject_id_"/>
-        <result property="subjectName" column="subject_name_"/>
-        <result property="kitPurchaseMethod" column="kit_purchase_method_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="goodsIdList" column="goods_id_list_"/>
-        <result property="price" column="price_"/>
-        <result property="organId" column="organ_id_"/>
-        <result property="organName" column="organ_name_"/>
-    </resultMap>
-
-    <resultMap id="studentManageBaseInfo" type="com.ym.mec.biz.dal.dto.StudentManageBaseDto" extends="studentManageListDto">
+        <result property="parentsName" column="parents_name_"/>
         <result property="birthdate" column="birthdate_"/>
-        <result property="parentName" column="parents_name_"/>
-        <collection property="musicGroups" resultMap="musicGroup" javaType="list"/>
+        <result property="currentGrade" column="current_grade_"/>
+        <result property="currentClass" column="current_class_"/>
+        <!--<collection property="musicGroups" resultMap="musicGroup" javaType="list"/>-->
     </resultMap>
 
     <resultMap id="studentManageCourseListDto" type="com.ym.mec.biz.dal.dto.StudentManageCourseListDto">
@@ -100,37 +84,12 @@
             AND su.organ_id_=#{organId}
         </if>
     </select>
-    <select id="findStudentBaseInfoByUserID" resultMap="studentManageBaseInfo">
-      SELECT
-            su.id_ user_id_,
-            su.username_,
-            su.gender_,
-            su.birthdate_,
-            sr.parents_name_,
-            sr.parents_phone_,
-            sr.music_group_id_,
-            sr.create_time_ join_date,
-            mg.name_ music_group_name_,
-            mg.status_ music_group_status,
-            cg.id_ class_group_id_,
-            cg.name_ class_group_name_,
-            sr.subject_id_,
-            sj.name_ subject_name_,
-            sr.kit_purchase_method_,
-            spod.goods_id_list_,
-            spod.price_
-        FROM
-            sys_user su
-            LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
-            LEFT JOIN class_group cg ON sr.class_group_id_=cg.id_
-            LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-            LEFT JOIN `subject` sj ON sr.subject_id_=sj.id_
-            LEFT JOIN organization o ON mg.organ_id_ = o.id_
-            LEFT JOIN school s ON mg.school_id_ = s.id_
-            LEFT JOIN student_payment_order spo ON sr.user_id_=spo.user_id_ AND sr.music_group_id_=spo.music_group_id_
-            LEFT JOIN student_payment_order_detail spod ON spo.id_=spod.payment_order_id_
-        WHERE
-            su.id_ =#{userID}
+    <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
+        SELECT su.real_name_,su.gender_,su.birthdate_,sr.parents_name_,su.id_ user_id_,
+        sr.parents_phone_,sr.current_class_,sr.current_grade_
+        FROM sys_user su
+        LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
+        WHERE su.id_ =#{userId} AND su.user_type_ LIKE CONCAT('%',"STUDENT",'%')
     </select>
 
     <select id="findGoodsNamesByIds" resultType="string">
@@ -140,24 +99,26 @@
       </foreach>
     </select>
 
+    <resultMap id="musicGroup" type="com.ym.mec.biz.dal.dto.StudentManageBaseInfoOfMusicGroupDto">
+        <result property="musicGroupId" column="music_group_id_"/>
+        <result property="musicGroupName" column="music_group_name_"/>
+        <result property="musicGroupStatus" column="music_group_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="joinMusicGroupDate" column="join_date_"/>
+        <result property="subjectId" column="subject_id_"/>
+        <result property="subjectName" column="subject_name_"/>
+        <result property="kitPurchaseMethod" column="kit_purchase_method_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="depositFee" column="deposit_fee_"/>
+        <result property="userId" column="user_id_"/>
+        <result property="userMusicGroupStatus" column="user_music_group_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+    </resultMap>
     <select id="findStudentMusicGroupsByUserId" resultMap="musicGroup">
-        SELECT
-            mg.id_ music_group_id_,
-            mg.name_ music_group_name_,
-            sr.create_time_ join_date,
-            mg.status_ music_group_status_,
-            s.name_ subject_name_,
-            sr.kit_purchase_method_,
-            cgsm.status_ student_status,
-            o.id_ organ_id_,
-            o.name_ organ_name_
-        FROM
-            student_registration sr
-        LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
-        LEFT JOIN organization o ON mg.organ_id_=o.id_
-        LEFT JOIN class_group_student_mapper cgsm ON sr.class_group_id_=cgsm.class_group_id_
-        LEFT JOIN `subject` s ON sr.subject_id_=s.id_
-        WHERE sr.user_id_=#{userID}
+        SELECT mg.id_ music_group_id_,sr.create_time_ join_date_,mg.name_ music_group_name_,mg.status_ music_group_status_,
+        s.id_ subject_id_,s.name_ subject_name_,sr.kit_purchase_method_,mgsp.deposit_fee_,sr.user_id_,sr.music_group_status_ user_music_group_status_
+        FROM student_registration sr
+        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
+        LEFT JOIN music_group_subject_plan mgsp ON mg.id_ = mgsp.music_group_id_ AND s.id_ = mgsp.subject_id_
+        WHERE sr.user_id_=#{userId}
     </select>
 
     <sql id="studentManageCourseQueryCondition">
@@ -280,7 +241,7 @@
             LEFT JOIN sys_user_bank_card subc ON suca.user_id_ = subc.user_id_
             AND subc.is_default_ = 1
         WHERE
-            suca.user_id_ =#{userID}
+            suca.user_id_ =#{userId}
     </select>
 
 </mapper>

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

@@ -180,4 +180,18 @@
         WHERE status_ <= 2
         ]]>
     </select>
+
+    <resultMap type="com.ym.mec.biz.dal.dto.UserGoodsDto" id="userGoodsDto">
+        <result column="goods_id_" property="goodsId"/>
+        <collection property="goodsName" ofType="string">
+            <result column="goods_name_"/>
+        </collection>
+    </resultMap>
+    <select id="findGoodsIds" resultMap="userGoodsDto">
+        SELECT g.id_ goods_id_,g.name_ goods_name_ FROM student_payment_order spo
+        LEFT JOIN student_payment_order_detail spod ON spo.id_ = spod.payment_order_id_
+        LEFT JOIN goods g ON FIND_IN_SET(g.id_,spod.goods_id_list_)
+        WHERE spo.type_ = 'APPLY' AND spo.status_ = 'SUCCESS' AND spod.goods_id_list_ IS NOT NULL
+        AND spo.music_group_id_ = #{musicGroupId} AND spo.user_id_ = #{userId}
+    </select>
 </mapper>

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

@@ -30,6 +30,7 @@
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="last_payment_date_" property="lastPaymentDate"/>
         <result column="next_payment_date_" property="nextPaymentDate"/>
+        <result column="music_group_status_" property="musicGroupStatus"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.StudentInfo" id="StudentInfo">
@@ -77,9 +78,9 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_registration
-        (parents_phone_,id_,user_id_,name_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,actual_subject_id_)
+        (parents_phone_,id_,user_id_,name_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,actual_subject_id_,music_group_status_)
         VALUES(#{parentsPhone},#{id},#{userId},#{name},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{remark},now(),now(),#{parentsName},#{parentsCompany},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId})
+        #{remark},now(),now(),#{parentsName},#{parentsCompany},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId},#{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -101,6 +102,9 @@
             <if test="kitPurchaseMethod != null">
                 kit_purchase_method_ = #{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            <if test="musicGroupStatus != null">
+                music_group_status_ = #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>

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

@@ -87,7 +87,7 @@
             LEFT JOIN vip_group_class_group_mapper vgcgm ON cgsm.class_group_id_=vgcgm.class_group_id_
             LEFT JOIN vip_group vg ON vgcgm.vip_group_id_=vg.id_
             LEFT JOIN vip_group_category vgc ON vg.vip_group_category_id_=vgc.id_
-        WHERE cgsm.class_group_id_=vgcgm.class_group_id_ AND cgsm.user_id_=#{userID}
+        WHERE cgsm.class_group_id_=vgcgm.class_group_id_ AND cgsm.user_id_=#{userId}
     </select>
 
     <!-- 全查询 -->

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

@@ -53,13 +53,6 @@ public class TeacherController extends BaseController {
         return succeed();
     }
 
-    /*@ApiOperation(value = "删除教师")
-    @PostMapping("/delete")
-    public Object update(Long userId) {
-        teacherService.deleteTeacher(userId);
-        return succeed();
-    }*/
-
     @ApiOperation(value = "根据教师编号查询教师基本信息")
     @GetMapping("/get")
     @ApiParam(value = "教师编号", required = true)

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

@@ -52,14 +52,14 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "删除单技班")
     @PostMapping("/delSingle")
     public Object delSingle(Integer classGroupId) {
-        classGroupService.delSingle(classGroupId);
+        classGroupService.delete(classGroupId);
         return succeed();
     }
 
     @ApiOperation(value = "删除合奏班")
     @PostMapping("/delMix")
     public Object delMix(Integer classGroupId) {
-        classGroupService.delMix(classGroupId);
+        classGroupService.delete(classGroupId);
         return succeed();
     }
 

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

@@ -37,14 +37,14 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "根据学生ID获取学生基本报名信息")
     @GetMapping("/findStudentBaseInfo")
-    public Object findStudentBaseInfo(@ApiParam(value = "学生编号", required = true) @RequestParam Long userID){
-        return succeed(studentManageService.findStudentManageBaseInfo(userID));
+    public Object findStudentBaseInfo(@ApiParam(value = "学生编号", required = true) Integer userId){
+        return succeed(studentManageService.findStudentManageBaseInfo(userId));
     }
 
     @ApiOperation(value = "根据学生ID获取其所在的乐团")
-    @GetMapping("/findStudentMusicGroups/{userID}")
-    public Object findStudentMusicGroups(@ApiParam(value = "学生编号", required = true) @PathVariable("userID") Long userID){
-        return succeed(studentManageService.findStudentMusicGroupsByUserId(userID));
+    @GetMapping("/findStudentMusicGroups")
+    public Object findStudentMusicGroups(@ApiParam(value = "学生编号", required = true) Integer userId){
+        return succeed(studentManageService.findStudentMusicGroupsByUserId(userId));
     }
 
     @ApiOperation(value = "根据乐团获取排课列表")
@@ -61,14 +61,14 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "获取学生vip课")
     @GetMapping("/findStudentVipGroups")
-    public Object findStudentVipGroups(Long userId){
+    public Object findStudentVipGroups(Integer userId){
         return succeed(studentManageService.findStudentVipGroups(userId));
     }
 
     @ApiOperation(value = "获取用户默认账户基本信息")
-    @GetMapping("/getUserCashAccountBaseInfo/{userID}")
-    public Object getUserCashAccountBaseInfo(@PathVariable("userID") Long userID){
-        return succeed(studentManageService.getStudentAccountBaseInfo(userID));
+    @GetMapping("/getUserCashAccountBaseInfo")
+    public Object getUserCashAccountBaseInfo(Integer userId){
+        return succeed(studentManageService.getStudentAccountBaseInfo(userId));
     }
 
 }

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

@@ -1,26 +1,16 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysMenu;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.page.TeacherQueryInfo;
-import com.ym.mec.biz.dal.page.VipClassQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-
 @RequestMapping("teacher")
 @Api(tags = "教师服务")
 @RestController
@@ -28,93 +18,9 @@ public class TeacherController extends BaseController {
 
     @Autowired
     private TeacherService teacherService;
-
-    @Autowired
-    private ClassGroupService classGroupService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    @ApiOperation(value = "新增教师")
-    @PostMapping("/add")
-    public Object add(Teacher teacher) {
-        try {
-            teacherService.add(teacher);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return failed(e.getMessage());
-        }
-        return succeed();
-    }
-
-    @ApiOperation(value = "修改教师")
-    @PostMapping("/update")
-    public Object update(Teacher teacher) {
-        teacher.setUpdateTime(new Date());
-        teacherService.updateTea(teacher);
-        return succeed();
-    }
-
-    /*@ApiOperation(value = "删除教师")
-    @PostMapping("/delete")
-    public Object update(Long userId) {
-        teacherService.deleteTeacher(userId);
-        return succeed();
-    }*/
-
-    @ApiOperation(value = "根据教师编号查询教师基本信息")
-    @GetMapping("/get")
-    @ApiParam(value = "教师编号", required = true)
-    public Object get(Integer id) {
-        return succeed(teacherService.getDetail(id));
-    }
-
-    @ApiOperation(value = "分页查询教师列表")
-    @GetMapping("/queryPage")
-    public Object queryPage(TeacherQueryInfo queryInfo) {
-        return succeed(teacherService.queryPageDetail(queryInfo));
-    }
-
-    @ApiOperation(value = "根据教师编号查询教师课程班列表")
-    @GetMapping("/getClass")
-    @ApiParam(value = "教师编号", required = true)
-    public Object getClassGroup(Integer id) {
-        return succeed(classGroupService.findClassGroup4Teacher(id));
-    }
-
-    @ApiOperation(value = "获取老师乐团课程信息列表")
-    @GetMapping("/getTeacherMusicClass")
-    @ApiParam(value = "教师编号", required = true)
-    public Object getTeacherMusicClass(Integer teacherId) {
-        return succeed(classGroupService.getTeacherMusicClass(teacherId));
-    }
-
-    @ApiOperation(value = "获取老师VIP课程信息列表")
-    @GetMapping("/getTeacherVipClass")
-    public Object getTeacherVipClass(VipClassQueryInfo queryInfo) {
-        return succeed(classGroupService.getTeacherVipClass(queryInfo));
-    }
-
-    @ApiOperation(value = "获取教师所有聊天群组")
-    @GetMapping("/queryTeacherGroups")
-    public Object queryTeacherGroups(String search) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("获取用户信息失败");
-        }
-        return succeed(teacherService.queryTeacherGroups(sysUser.getId(), search));
-    }
-
-    @ApiOperation(value = "获取和当前教师相关的所有学员聊天列表")
-    @GetMapping("/queryGroupStudents")
-    public Object queryGroupStudents(String search) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("获取用户信息失败");
-        }
-        return succeed(teacherService.queryGroupStudents(sysUser.getId(), search));
-    }
-
-
     @ApiOperation(value = "获取分部所有老师")
     @GetMapping("/findTeachers")
     public HttpResponseResult findTeachers() {