fix musicGroup reg

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

@@ -7,7 +7,6 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 import java.util.Map;
@@ -91,7 +90,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") Integer musicGroupId);
+    List<ClassGroupTeachersDto> findClassGroupByMusicGroupId(@Param("musicGroupId") Integer musicGroupId);
 
     /**
      * 获取学生所购买课程列表

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

@@ -1,7 +1,5 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.common.dal.BaseDAO;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroupTeachers.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroupTeachersDto.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 班级老师
  */
-public class ClassGroupTeachers extends ClassGroup {
+public class ClassGroupTeachersDto extends ClassGroup {
 
 	/** 班级老师 **/
 	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HighClassGroup.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HighClassGroupDto.java

@@ -9,9 +9,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 
 /**
- * 提交班
+ * 提高班
  */
-public class HighClassGroup extends ClassGroup {
+public class HighClassGroupDto extends ClassGroup {
 
 	@ApiModelProperty(value = "教师user_id",required = true)
 	private Integer userId;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupRegResp.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupRegRespDto.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 乐团报名，乐团基本信息
  */
-public class MusicGroupRegResp {
+public class MusicGroupRegRespDto {
 
     //乐团名称
     private String musicGroupName;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupSubjectGoodsAndInfo.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupSubjectGoodsAndInfoDto.java

@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * 乐团报名缴费相关信息
  */
-public class MusicGroupSubjectGoodsAndInfo {
+public class MusicGroupSubjectGoodsAndInfoDto {
 
     //课程信息
     private Map CourseScheduleInfo;

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

@@ -79,7 +79,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      * @throws Exception
      */
-    List<HighClassGroup> addHighClassGroup(List<HighClassGroup> highClassGroupList) throws Exception;
+    List<HighClassGroupDto> addHighClassGroup(List<HighClassGroupDto> highClassGroupList) throws Exception;
 
     /**
      * 获取老师乐团课程信息列表
@@ -104,7 +104,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId);
+    List<ClassGroupTeachersDto> getClassGroupAndTeachers(Integer musicGroupId);
 
     /**
      * 获取乐团班级老师课酬
@@ -112,7 +112,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId);
+    List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(Integer musicGroupId);
 
 
     /**

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

@@ -1,12 +1,8 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.common.service.BaseService;
 
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassGroupTeacherMapper> {

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

@@ -1,12 +1,10 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.MusicGroupRegResp;
-import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
+import com.ym.mec.biz.dal.dto.MusicGroupRegRespDto;
+import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.common.service.BaseService;
 
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface MusicGroupSubjectPlanService extends BaseService<Integer, MusicGroupSubjectPlan> {
@@ -35,13 +33,13 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      * @param subjectId
      * @return
      */
-    MusicGroupSubjectGoodsAndInfo getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId);
+    MusicGroupSubjectGoodsAndInfoDto getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId);
 
     /**
      * 乐团报名基本信息
      * @param musicGroupId
      * @return
      */
-    MusicGroupRegResp getMusicGroupRegInfo(Integer musicGroupId);
+    MusicGroupRegRespDto getMusicGroupRegInfo(Integer musicGroupId);
 
 }

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

@@ -165,8 +165,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<HighClassGroup> addHighClassGroup(List<HighClassGroup> highClassGroupList) throws Exception {
-        for (HighClassGroup highClassGroup : highClassGroupList) {
+    public List<HighClassGroupDto> addHighClassGroup(List<HighClassGroupDto> highClassGroupList) throws Exception {
+        for (HighClassGroupDto highClassGroup : highClassGroupList) {
             //1、插入班级信息
             Date date;
             date = new Date();
@@ -255,12 +255,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId) {
-        List<ClassGroupTeachers> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId);
+    public List<ClassGroupTeachersDto> getClassGroupAndTeachers(Integer musicGroupId) {
+        List<ClassGroupTeachersDto> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId);
 
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
 
-        for (ClassGroupTeachers classGroupAndTeachers : classGroupAndTeachersList) {
+        for (ClassGroupTeachersDto classGroupAndTeachers : classGroupAndTeachersList) {
             List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
             for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
                 if (classGroupTeacherMapper.getClassGroupId().equals(classGroupAndTeachers.getId())) {
@@ -273,9 +273,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId) {
+    public List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(Integer musicGroupId) {
         //乐团班级及班级老师
-        List<ClassGroupTeachers> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
+        List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
         //乐团的课程计划
         List<CourseSchedule> classGroupCourseSchedules = courseScheduleService.findClassGroupCourseSchedules(classGroupAndTeachers);
 
@@ -284,7 +284,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         //基础课时
         BigDecimal baseDuration = new BigDecimal("30");
-        for (ClassGroupTeachers classGroupAndTeacher : classGroupAndTeachers) {
+        for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
 
             Set<Long> courseScheduleDurationSet = new HashSet<>();
             for (CourseSchedule classGroupCourseSchedule : classGroupCourseSchedules) {

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

@@ -1,7 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.entity.ClassGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dto.MusicGroupRegResp;
-import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
+import com.ym.mec.biz.dal.dto.MusicGroupRegRespDto;
+import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.service.*;
@@ -14,7 +13,6 @@ import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -60,7 +58,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public MusicGroupSubjectGoodsAndInfo getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId) {
+    public MusicGroupSubjectGoodsAndInfoDto getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId) {
         MusicGroup musicGroup = musicGroupService.get(musicGroupId.toString());
 
         //课程形态
@@ -78,7 +76,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
                 });
             }
         });
-        MusicGroupSubjectGoodsAndInfo musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfo();
+        MusicGroupSubjectGoodsAndInfoDto musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfoDto();
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
         musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
@@ -86,8 +84,8 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public MusicGroupRegResp getMusicGroupRegInfo(Integer musicGroupId) {
-        MusicGroupRegResp musicGroupRegResp = new MusicGroupRegResp();
+    public MusicGroupRegRespDto getMusicGroupRegInfo(Integer musicGroupId) {
+        MusicGroupRegRespDto musicGroupRegResp = new MusicGroupRegRespDto();
 
         //乐团信息
         MusicGroup musicGroup = musicGroupService.get(musicGroupId.toString());

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

@@ -238,7 +238,7 @@
     </select>
 
 
-    <resultMap type="com.ym.mec.biz.dal.dto.ClassGroupTeachers" id="ClassGroupTeachers">
+    <resultMap type="com.ym.mec.biz.dal.dto.ClassGroupTeachersDto" id="ClassGroupTeachers">
         <result column="id_" property="id"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="subject_id_list_" property="subjectIdList"/>

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

@@ -2,8 +2,7 @@ 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.auth.service.SysUserService;
-import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
+import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
@@ -57,11 +56,11 @@ public class RegisterController extends BaseController {
 
 
     @ApiOperation(value = "获取乐团声部费用信息及乐器和辅件")
-    @GetMapping("/findGoodsGroups")
+    @GetMapping("/getSubjectGoodsAndInfo")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public HttpResponseResult findGoodsGroups(Integer musicGroupId) {
+    public HttpResponseResult getSubjectGoodsAndInfo(Integer musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        MusicGroupSubjectGoodsAndInfo subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
+        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
         return succeed(subjectGoodsAndInfo);
     }
 

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

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.dto.HighClassGroup;
+import com.ym.mec.biz.dal.dto.HighClassGroupDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -51,11 +51,11 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "新增提高班")
     @PostMapping("/addHighClass")
-    public Object addHighClass(@ApiParam(value = "乐团提高班json", required = true) @RequestParam List<HighClassGroup> HighClassGroupList) throws Exception {
-        if (HighClassGroupList.size() <= 0) {
+    public Object addHighClass(@ApiParam(value = "乐团提高班json", required = true) @RequestParam List<HighClassGroupDto> highClassGroupDtoList) throws Exception {
+        if (highClassGroupDtoList.size() <= 0) {
             return failed("参数不合法");
         }
-        return succeed(classGroupService.addHighClassGroup(HighClassGroupList));
+        return succeed(classGroupService.addHighClassGroup(highClassGroupDtoList));
     }
 
     @ApiOperation(value = "删除班级")