update

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

@@ -3,15 +3,14 @@ package com.ym.mec.web.controller;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.MusicGroup;
 import com.ym.mec.web.dal.page.MusicGroupQueryInfo;
-import com.ym.mec.web.dal.utilEntity.SubSettingUtilEntity;
 import com.ym.mec.web.service.MusicGroupService;
 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.*;
+
 import java.util.Date;
-import java.util.List;
 
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
@@ -57,17 +56,4 @@ public class MusicGroupController extends BaseController {
     public Object queryPage(@RequestBody MusicGroupQueryInfo queryInfo){
         return succeed(musicGroupService.queryPage(queryInfo));
     }
-
-    @ApiOperation(value = "【建团申请-->】，新增、修改提交【声部设置】")
-    @PostMapping("/subSet")
-    public Object subSet(@RequestBody List<SubSettingUtilEntity> subSettingUtilEntitys){
-        musicGroupService.subSetting(subSettingUtilEntitys);
-        return succeed();
-    }
-
-    @ApiOperation(value = "建团申请，根据乐团编号获取已有声部设置")
-    @PostMapping("/getSubSet")
-    public Object getSubSetting(@RequestBody Integer musicGroupId){
-        return succeed(musicGroupService.getSubSetting(musicGroupId));
-    }
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseScheduleDao.java

@@ -2,8 +2,8 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.CourseSchedule;
-import com.ym.mec.web.dal.utilEntity.StudentAttendanceViewUtilEntity;
-import com.ym.mec.web.dal.utilEntity.TeacherAttendanceViewUtilEntity;
+import com.ym.mec.web.dal.dto.StudentAttendanceViewDto;
+import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,13 +15,13 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param teacherID
      * @return
      */
-    TeacherAttendanceViewUtilEntity getCurrentCourseDetail(@Param("teacherID") Integer teacherID);
+    TeacherAttendanceDto getCurrentCourseDetail(@Param("teacherID") Integer teacherID);
 
     /**
      * 根据班级ID获取该班级学生
      * @param classID
      * @return
      */
-    List<StudentAttendanceViewUtilEntity> getCurrentCourseStudents(@Param("classID") Long classID);
+    List<StudentAttendanceViewDto> getCurrentCourseStudents(@Param("classID") Long classID);
 
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupSubjectPlanDao.java

@@ -2,7 +2,7 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.web.dal.utilEntity.SubSetViewUtilEntity;
+import com.ym.mec.web.dal.dto.SubSetViewDto;
 
 import java.util.List;
 
@@ -14,5 +14,5 @@ public interface MusicGroupSubjectPlanDao extends BaseDAO<Integer, MusicGroupSub
      * @param musicGroupId
      * @return
      */
-    List<SubSetViewUtilEntity> findSubByGroupId(Integer musicGroupId);
+    List<SubSetViewDto> findSubByGroupId(Integer musicGroupId);
 }

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

@@ -2,8 +2,7 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.StudentRegistration;
-import com.ym.mec.web.dal.page.StudentRegistrationQueryInfo;
-import com.ym.mec.web.dal.utilEntity.StudentApplyDetailUtilEntity;
+import com.ym.mec.web.dal.dto.StudentApplyDetailDto;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param params
      * @return
      */
-    List<StudentApplyDetailUtilEntity> queryStudentDetailPage(Map<String, Object> params);
+    List<StudentApplyDetailDto> queryStudentDetailPage(Map<String, Object> params);
 
     /**
      * 获取乐团学员报名详情条数

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/StudentApplyDetailUtilEntity.java → mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentApplyDetailDto.java

@@ -1,11 +1,11 @@
-package com.ym.mec.web.dal.utilEntity;
+package com.ym.mec.web.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import com.ym.mec.common.enums.UserGenderEnum;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 
-public class StudentApplyDetailUtilEntity {
+public class StudentApplyDetailDto {
 
     @ApiModelProperty(value = "学生姓名",required = false)
     private String studentName;

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/StudentAttendanceViewUtilEntity.java → mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentAttendanceViewDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.utilEntity;
+package com.ym.mec.web.dal.dto;
 
 import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date 2019/9/11
  * 上课点名响应
  */
-public class StudentAttendanceViewUtilEntity {
+public class StudentAttendanceViewDto {
 
     @ApiModelProperty(value = "乐团ID",required = false)
     private Long musicGroupId;

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/SubSetViewUtilEntity.java → mec-web/src/main/java/com/ym/mec/web/dal/dto/SubSetViewDto.java

@@ -1,11 +1,11 @@
-package com.ym.mec.web.dal.utilEntity;
+package com.ym.mec.web.dal.dto;
 
 import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
-public class SubSetViewUtilEntity {
+public class SubSetViewDto {
 
     @ApiModelProperty(value = "乐团科目规划表编号",required = false)
     private Integer planId;

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/SubSettingUtilEntity.java → mec-web/src/main/java/com/ym/mec/web/dal/dto/SubSettingDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.utilEntity;
+package com.ym.mec.web.dal.dto;
 
 import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
 
 //建团申请，声部设置实体类
-public class SubSettingUtilEntity {
+public class SubSettingDto {
 
     @ApiModelProperty(value = "乐团科目规划表编号",required = false)
     private Integer planId;

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/TeacherAttendanceViewUtilEntity.java → mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherAttendanceDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.utilEntity;
+package com.ym.mec.web.dal.dto;
 
 import com.ym.mec.web.dal.enums.CourseStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +9,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2019/9/10
  */
-public class TeacherAttendanceViewUtilEntity {
+public class TeacherAttendanceDto {
 
     @ApiModelProperty(value = "课程计划ID",required = false)
     private Long courseScheduleId;

mec-web/src/main/java/com/ym/mec/web/service/CourseScheduleService.java

@@ -2,8 +2,8 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.CourseSchedule;
-import com.ym.mec.web.dal.utilEntity.StudentAttendanceViewUtilEntity;
-import com.ym.mec.web.dal.utilEntity.TeacherAttendanceViewUtilEntity;
+import com.ym.mec.web.dal.dto.StudentAttendanceViewDto;
+import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
 
 import java.util.List;
 
@@ -14,13 +14,13 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
      * @Date: 2019/9/10
      * 根据教师ID获取当前课程的信息
      */
-    TeacherAttendanceViewUtilEntity getCurrentCourseDetail(Integer teacherId);
+    TeacherAttendanceDto getCurrentCourseDetail(Integer teacherId);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/11
      * 根据班级ID获取当前课程的学生
      */
-    List<StudentAttendanceViewUtilEntity> getCurrentCourseStudents(Long classID);
+    List<StudentAttendanceViewDto> getCurrentCourseStudents(Long classID);
 
 }

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

@@ -2,10 +2,6 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.MusicGroup;
-import com.ym.mec.web.dal.utilEntity.SubSetViewUtilEntity;
-import com.ym.mec.web.dal.utilEntity.SubSettingUtilEntity;
-
-import java.util.List;
 
 public interface MusicGroupService extends BaseService<String, MusicGroup> {
 }

mec-web/src/main/java/com/ym/mec/web/service/StudentRegistrationService.java

@@ -4,7 +4,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.StudentRegistration;
 import com.ym.mec.web.dal.page.StudentRegistrationQueryInfo;
-import com.ym.mec.web.dal.utilEntity.StudentApplyDetailUtilEntity;
+import com.ym.mec.web.dal.dto.StudentApplyDetailDto;
 
 public interface StudentRegistrationService extends BaseService<Long, StudentRegistration> {
 
@@ -13,7 +13,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      * @param queryInfo
      * @return
      */
-    PageInfo<StudentApplyDetailUtilEntity> queryStudentDetailPage(StudentRegistrationQueryInfo queryInfo);
+    PageInfo<StudentApplyDetailDto> queryStudentDetailPage(StudentRegistrationQueryInfo queryInfo);
 
     /**
      * 批量调剂

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

@@ -1,7 +1,7 @@
 package com.ym.mec.web.service.impl;
 
-import com.ym.mec.web.dal.utilEntity.StudentAttendanceViewUtilEntity;
-import com.ym.mec.web.dal.utilEntity.TeacherAttendanceViewUtilEntity;
+import com.ym.mec.web.dal.dto.StudentAttendanceViewDto;
+import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,12 +25,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public TeacherAttendanceViewUtilEntity getCurrentCourseDetail(Integer teacherId) {
+	public TeacherAttendanceDto getCurrentCourseDetail(Integer teacherId) {
 		return courseScheduleDao.getCurrentCourseDetail(teacherId);
 	}
 
 	@Override
-	public List<StudentAttendanceViewUtilEntity> getCurrentCourseStudents(Long classID) {
+	public List<StudentAttendanceViewDto> getCurrentCourseStudents(Long classID) {
 		return courseScheduleDao.getCurrentCourseStudents(classID);
 	}
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/StudentRegistrationServiceImpl.java

@@ -4,7 +4,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import com.ym.mec.web.dal.page.StudentRegistrationQueryInfo;
-import com.ym.mec.web.dal.utilEntity.StudentApplyDetailUtilEntity;
+import com.ym.mec.web.dal.dto.StudentApplyDetailDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,12 +28,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 	}
 
 	@Override
-	public PageInfo<StudentApplyDetailUtilEntity> queryStudentDetailPage(StudentRegistrationQueryInfo queryInfo) {
-		PageInfo<StudentApplyDetailUtilEntity> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+	public PageInfo<StudentApplyDetailDto> queryStudentDetailPage(StudentRegistrationQueryInfo queryInfo) {
+		PageInfo<StudentApplyDetailDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 
-		List<StudentApplyDetailUtilEntity> dataList = null;
+		List<StudentApplyDetailDto> dataList = null;
 		int count = studentRegistrationDao.queryStudentDetailCount(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);

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

@@ -94,7 +94,7 @@
 		SELECT COUNT(*) FROM course_schedule
 	</select>
 
-    <resultMap type="com.ym.mec.web.dal.utilEntity.TeacherAttendanceViewUtilEntity" id="TeacherAttendanceViewUtilEntity">
+    <resultMap type="com.ym.mec.web.dal.dto.TeacherAttendanceDto" id="TeacherAttendanceViewUtilEntity">
         <result property="courseScheduleId" column="id_"/>
         <result property="classDate" column="class_date_"/>
         <result property="startClassTime" column="start_class_time_"/>
@@ -137,7 +137,7 @@
         ORDER BY cs.start_class_time_ LIMIT 1
     </select>
 
-    <resultMap id="studentAttendanceViewUtilEntity" type="com.ym.mec.web.dal.utilEntity.StudentAttendanceViewUtilEntity">
+    <resultMap id="studentAttendanceViewUtilEntity" type="com.ym.mec.web.dal.dto.StudentAttendanceViewDto">
         <result property="classGroupId" column="class_group_id_"/>
         <result property="studentId" column="student_id_"/>
         <result property="userName" column="username_"/>

mec-web/src/main/resources/config/mybatis/MusicGroupSubjectPlanMapper.xml

@@ -90,7 +90,7 @@
 		SELECT COUNT(*) FROM music_group_subject_plan
 	</select>
 
-    <resultMap type="com.ym.mec.web.dal.utilEntity.SubSetViewUtilEntity" id="findSubByGroupIdMap">
+    <resultMap type="com.ym.mec.web.dal.dto.SubSetViewDto" id="findSubByGroupIdMap">
         <result column="plan_id_" property="planId" />
         <result column="sub_id_" property="subId" />
         <result column="sub_name_" property="subName" />

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

@@ -129,7 +129,7 @@
 		SELECT COUNT(*) FROM student_registration
 	</select>
 
-    <resultMap type="com.ym.mec.web.dal.utilEntity.StudentApplyDetailUtilEntity" id="studentApplyDetail">
+    <resultMap type="com.ym.mec.web.dal.dto.StudentApplyDetailDto" id="studentApplyDetail">
         <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
         <result column="is_allow_adjust_" property="isAllowAdjust" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>