Merge remote-tracking branch 'origin/master'

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

@@ -30,6 +30,15 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ClassGroup> findAllMixClassGroup(@Param("musicGroupId") Integer musicGroupId);
 
     /**
+     * @Author: Joburgess
+     * @Date: 2019/10/8
+     * @params [musicGroupId]
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
+     * @describe 获取所有班级
+     */
+    List<ClassGroup> findAllClassGroupByMusicGroup(@Param("musicGroupId") Long musicGroupId);
+
+    /**
      * 根据合奏班ID查询该合奏班下的子班级
      *
      * @param mixClassGroupId

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

@@ -2,8 +2,17 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseScheduleComplaints> {
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/8
+     * @params [userId, courseScheduleId]
+     * @return com.ym.mec.biz.dal.entity.CourseScheduleComplaints
+     * @describe 根据用户和课程获取申诉详情
+     */
+    CourseScheduleComplaints findByUserAndCourse(@Param("userId") Long userId,@Param("courseScheduleId") Long courseScheduleId);
 	
 }

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

@@ -159,4 +159,21 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<StudentCourseScheduleRecordDto> findStudentCourseScheduleNotStartRecords(@Param("userId") Long userId,
                                                                                   @Param("date") Date date);
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/8
+     * @params [classGroupId]
+     * @return int
+     * @describe 统计已上课次
+     */
+    int countClassTimes(Long classGroupId);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/17
+     * 获取课程信息
+     */
+    CourseScheduleDto getCourseSchedules(@Param("classDate") Long courseScheduleId);
+
+
 }

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

@@ -5,5 +5,21 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGroupDefaultClassesCycle> {
 
+
+    VipGroupDefaultClassesCycle checkMaxClassTimes(Integer maxClassTimes);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/8
+     * @params [maxClassTimes]
+     * @return com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle
+     * @describe 根据最大课次获取上一梯度信息
+     */
+    VipGroupDefaultClassesCycle findByMaxClassTimes(Integer maxClassTimes);
+
+
+    VipGroupDefaultClassesCycle findByMinClassTimes(Integer minClassTimes);
+
+    int countAll();
 	
 }

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

@@ -23,6 +23,17 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "班级编号，房间号",required = false)
     private String sealClassId;
 
+    @ApiModelProperty(value = "课程结束后课申诉时间限制")
+    private Integer vipAppealDaysRange;
+
+    public Integer getVipAppealDaysRange() {
+        return vipAppealDaysRange;
+    }
+
+    public void setVipAppealDaysRange(Integer vipAppealDaysRange) {
+        this.vipAppealDaysRange = vipAppealDaysRange;
+    }
+
     public String getSealClassId() {
         return sealClassId;
     }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,13 +12,13 @@ public class CourseScheduleComplaints {
 	/**  */
 	private Long id;
 	
-	/**  */
+	@ApiModelProperty(value = "用户ID")
 	private Integer userId;
 	
-	/**  */
+	@ApiModelProperty(value = "课程ID")
 	private Long courseScheduleId;
 	
-	/**  */
+	@ApiModelProperty(value = "原因")
 	private String reason;
 	
 	/**  */

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

@@ -44,7 +44,18 @@ public class StudentAttendance {
 	/** 如果是请假状态，此字段就指请假原因 */
 	@ApiModelProperty(value = "如果是请假状态，此字段就指请假原因",required = false)
 	private String remark;
-	
+
+	@ApiModelProperty(value = "当前课时")
+	private Integer currentClassTimes;
+
+	public Integer getCurrentClassTimes() {
+		return currentClassTimes;
+	}
+
+	public void setCurrentClassTimes(Integer currentClassTimes) {
+		this.currentClassTimes = currentClassTimes;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -1,7 +1,5 @@
 package com.ym.mec.biz.service;
 
-import java.util.List;
-
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
@@ -12,6 +10,8 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
@@ -48,6 +48,15 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     List<ClassGroup> findAllMixClassGroupByMusicGroupId(int musicGroupId);
 
     /**
+     * @Author: Joburgess
+     * @Date: 2019/10/8
+     * @params [musicGroupId]
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
+     * @describe 获取乐团下所有班级
+     */
+    List<ClassGroup> findAllClassGroupByMusicGroup(Long musicGroupId);
+
+    /**
      * 添加单技班
      *
      * @param classGroup

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

@@ -89,6 +89,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    public List<ClassGroup> findAllClassGroupByMusicGroup(Long musicGroupId) {
+        List<ClassGroup> allMixClassGroup = classGroupDao.findAllClassGroupByMusicGroup(musicGroupId);
+        return allMixClassGroup;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public ClassGroup addClassGroup(ClassGroup classGroup) throws Exception {
         Date date;

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

@@ -339,6 +339,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	@Override
 	public void courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints) {
 		SysUser user = sysUserFeignService.queryUserInfo();
+
+		CourseScheduleComplaints byUserAndCourse = courseScheduleComplaintsDao.findByUserAndCourse(courseScheduleComplaints.getUserId().longValue(), courseScheduleComplaints.getCourseScheduleId());
+		if(byUserAndCourse!=null){
+			throw new BizException("您已经对该课程进行过申诉操作!");
+		}
+
+		CourseScheduleDto courseSchedules = courseScheduleDao.getCourseSchedules(courseScheduleComplaints.getCourseScheduleId());
+		Date now=new Date();
+		int i = DateUtil.daysBetween(courseSchedules.getEndClassTime(), now);
+		if(i>courseSchedules.getVipAppealDaysRange()){
+			throw new BizException("该课程已超过可申诉时间范围!");
+		}
 		courseScheduleComplaints.setUserId(user.getId());
 		courseScheduleComplaints.setStatus(AuditStatusEnum.ING);
 		courseScheduleComplaintsDao.insert(courseScheduleComplaints);

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.StudentAttendanceDao;
 import com.ym.mec.biz.dal.dto.StudentPersonalAttendanceDto;
@@ -29,6 +30,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	private StudentAttendanceDao studentAttendanceDao;
 	@Autowired
 	private MusicGroupStudentFeeDao studentFeeDao;
+	@Autowired
+	private CourseScheduleDao courseScheduleDao;
 
 	@Override
 	public BaseDAO<Long, StudentAttendance> getDAO() {
@@ -37,7 +40,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 
 	@Override
 	public void addStudentAttendances(List<StudentAttendance> studentAttendances) {
+		int classTimes=courseScheduleDao.countClassTimes(studentAttendances.get(0).getClassGroupId().longValue());
 		studentAttendances.forEach(studentAttendance -> {
+			studentAttendance.setCurrentClassTimes(classTimes);
 			StudentAttendance studentAttendanceInfo = studentAttendanceDao.getStudentAttendanceInfo(studentAttendance);
 			if (studentAttendance.getStatus() != StudentAttendanceStatusEnum.DROP_OUT) {
 				//判断是否为连续旷课

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,5 +20,19 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 	public BaseDAO<Integer, VipGroupDefaultClassesCycle> getDAO() {
 		return vipGroupDefaultClassesCycleDao;
 	}
-	
+
+	@Override
+	public long insert(VipGroupDefaultClassesCycle bean) {
+		if(vipGroupDefaultClassesCycleDao.countAll()>0){
+
+		}else{
+
+		}
+		VipGroupDefaultClassesCycle checkMaxClassTimes = vipGroupDefaultClassesCycleDao.checkMaxClassTimes(bean.getMaxClassTimes());
+		if(null!=checkMaxClassTimes){
+			throw new BizException("已存在包含该课次的设置!");
+		}
+		vipGroupDefaultClassesCycleDao.findByMaxClassTimes(bean.getMaxClassTimes());
+		return super.insert(bean);
+	}
 }

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

@@ -280,12 +280,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 		StudentApplyRefunds studentApplyRefunds=new StudentApplyRefunds();
 		StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupId,studentId);
+		if(null==studentPaymentOrder){
+			throw new BizException("未找到相关订单信息！");
+		}
 		VipGroup vipGroup=vipGroupDao.get(vipGroupId);
 		//剩余课时数
 		Map surplusClassTimes=MapUtil.convertMybatisMap(vipGroupDao.countSurplusClassTimes(vipGroupId));
 		studentApplyRefunds.setExpectAmount(countVipGroupPredictFee(vipGroup,
-				new BigDecimal(surplusClassTimes.get(TeachModeEnum.ONLINE.getMsg()).toString()),
-				new BigDecimal(surplusClassTimes.get(TeachModeEnum.OFFLINE.getMsg()).toString())));
+				new BigDecimal(surplusClassTimes.get(TeachModeEnum.ONLINE.getCode()).toString()),
+				new BigDecimal(surplusClassTimes.get(TeachModeEnum.OFFLINE.getCode()).toString())));
 		studentApplyRefunds.setStatus(AuditStatusEnum.ING);
 		String orderNo=StringUtils.join(new String[]{studentId.toString(),String.valueOf(System.currentTimeMillis())});
 		studentApplyRefunds.setOrderNo(orderNo);

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

@@ -384,4 +384,11 @@
     <select id="countClassStudent" resultType="int">
         select count(*) from class_group_student_mapper where class_group_id_=#{classGroupId}
     </select>
+    <select id="findAllClassGroupByMusicGroup" resultMap="ClassGroup">
+        SELECT
+        *
+        FROM
+        class_group cg
+        WHERE cg.music_group_id_=#{musicGroupId} AND del_flag_='0'
+    </select>
 </mapper>

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

@@ -83,4 +83,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_schedule_complaints
 	</select>
+    <select id="findByUserAndCourse" resultMap="CourseScheduleComplaints">
+		SELECT * FROM course_schedule_complaints WHERE user_id_=#{userId} AND course_schedule_id_=#{courseScheduleId}
+    </select>
 </mapper>

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

@@ -248,7 +248,8 @@
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.status_,
 	        su.username_ teacher_name_,
-	        sa.status_ attendance_status_
+	        sa.status_ attendance_status_,
+			sc.paran_value_
         FROM
             course_schedule cs
             LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
@@ -494,4 +495,33 @@
             LEFT JOIN class_group cg ON cgsm.class_group_id_=cg.id_
         WHERE cs.status_='NOT_START' AND cgsm.user_id_=#{userId} AND cs.class_date_=DATE_FORMAT(#{date},'%Y%m%d')
     </select>
+    <select id="findCourseScheduleByMusicGroup" resultMap="CourseSchedule">
+        SELECT
+            cs.*
+        FROM
+            class_group cg
+            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
+            WHERE  cg.music_group_id_=#{musicGroupId}
+    </select>
+    <select id="countClassTimes" resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            course_schedule cs
+            WHERE cs.class_group_id_=#{classGroupId} AND cs.status_!="NOT_START"
+    </select>
+    <select id="getCourseSchedules" resultMap="courseScheduleDto">
+        SELECT
+            cs.type_,
+            cs.id_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end
+			sc.paran_value_
+        FROM
+            course_schedule cs
+			LEFT JOIN sys_config sc ON sc.param_name_="vip_appeal_days_range"
+        WHERE
+            cs.id_=#{courseScheduleId}
+    </select>
 </mapper>

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

@@ -16,6 +16,7 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="remark_" property="remark"/>
+        <result column="current_class_times_" property="currentClassTimes"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -37,15 +38,15 @@
         </selectKey>
         -->
         INSERT INTO student_attendance
-        (id_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_)
-        VALUES(#{id},#{musicGroupId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{remark})
+        (id_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_,current_class_times_)
+        VALUES(#{id},#{musicGroupId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{remark},#{currentClassTimes})
     </insert>
 
     <insert id="addStudentAttendances" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-      INSERT INTO student_attendance ( music_group_id_, class_group_id_, course_schedule_id_, user_id_, teacher_id_, status_, create_time_, remark_ )
+      INSERT INTO student_attendance ( music_group_id_, class_group_id_, course_schedule_id_, user_id_, teacher_id_, status_, create_time_, remark_ ,current_class_times_)
       VALUES
 	  <foreach collection="list" item="studentAttendance" separator=",">
-          (#{studentAttendance.musicGroupId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},#{studentAttendance.userId},#{studentAttendance.teacherId},#{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{studentAttendance.remark})
+          (#{studentAttendance.musicGroupId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},#{studentAttendance.userId},#{studentAttendance.teacherId},#{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{studentAttendance.remark},#{studentAttendance.currentClassTimes})
       </foreach>
     </insert>
 
@@ -74,6 +75,9 @@
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},
             </if>
+            <if test="currentClassTimes != null">
+                current_class_times_ = #{currentClassTimes},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -23,6 +23,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupCategory">
 		SELECT * FROM vip_group_category
+		WHERE del_flag_=0
 		ORDER BY id_
 	</select>
 

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

@@ -32,7 +32,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},#{createTime},#{updateTime})
+		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},now(),now())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,4 +73,36 @@ create_time_ = #{createTime},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM vip_group_default_classes_cycle
 	</select>
+	<select id="checkMaxClassTimes" resultMap="VipGroupDefaultClassesCycle">
+		SELECT
+			*
+		FROM
+			vip_group_default_classes_cycle
+			WHERE min_class_times_&gt;#{minClassTimes}
+			AND min_class_times_&gt;#{minClassTimes}
+		ORDER BY min_class_times_ LIMIT 1
+	</select>
+	<select id="findByMaxClassTimes" resultMap="VipGroupDefaultClassesCycle">
+		SELECT
+		*
+		FROM
+		vip_group_default_classes_cycle
+		WHERE max_class_times_&lt;#{maxClassTimes}
+		ORDER BY max_class_times_ DESC LIMIT 1
+	</select>
+	<select id="findByMinClassTimes" resultMap="VipGroupDefaultClassesCycle">
+		SELECT
+			*
+		FROM
+			vip_group_default_classes_cycle
+			WHERE min_class_times_&gt;#{minClassTimes}
+		ORDER BY min_class_times_ LIMIT 1
+	</select>
+    <select id="countAll" resultType="int">
+		SELECT
+			count(*)
+		FROM
+			vip_group_default_classes_cycle
+		LIMIT 1
+    </select>
 </mapper>

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

@@ -63,7 +63,7 @@ public class StudentCourseScheduleController extends BaseController {
         return succeed(scheduleService.findStudentCourseScheduleRecords(queryInfo));
     }
 
-    @ApiModelProperty("课程投诉")
+    @ApiModelProperty(value = "课程投诉")
     @PostMapping("/courseScheduleCommplaint")
     public Object courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints){
         scheduleService.courseScheduleCommplaint(courseScheduleComplaints);

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

@@ -33,7 +33,7 @@ public class StudentVipGroupController extends BaseController {
     @Autowired
     private SubjectService subjectService;
 
-    @ApiOperation("获取vip课列表筛选条件")
+    @ApiOperation(value = "获取vip课列表筛选条件")
     @GetMapping(value = "/findQueryCondition")
     public Object findQueryCondition(){
         List<QueryConditionDto> conditions=new ArrayList<>();
@@ -45,7 +45,7 @@ public class StudentVipGroupController extends BaseController {
         return succeed(conditions);
     }
 
-    @ApiOperation("获取vip课列表")
+    @ApiOperation(value = "获取vip课列表")
     @PostMapping(value = "/queryVipGroups")
     public Object queryVipGroups(@RequestBody StudentVipGroupQueryInfo queryInfo){
         Map<String,Object> result=new HashMap<>();
@@ -54,20 +54,20 @@ public class StudentVipGroupController extends BaseController {
         return succeed(result);
     }
 
-    @ApiOperation("获取学生端vip课显示详情")
+    @ApiOperation(value = "获取学生端vip课显示详情")
     @GetMapping(value = "/getVipGroupShowDetail")
     public Object getVipGroupShowDetail(Long vipGroupId){
         return succeed(vipGroupService.getVipGroupShowDetail(vipGroupId));
     }
 
-    @ApiModelProperty("vip课购买")
+    @ApiModelProperty(value = "vip课购买")
     @PostMapping("/buyVipGroup")
     public Object buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams){
         vipGroupService.buyVipGroup(vipGroupBuyParams);
         return succeed();
     }
 
-    @ApiModelProperty("vip课购买")
+    @ApiModelProperty(value = "vip课退课")
     @PostMapping("/applyRefund")
     public Object applyRefund(Long vipGroupId){
         vipGroupService.applyRefund(vipGroupId,null);

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

@@ -1,22 +1,5 @@
 package com.ym.mec.web.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.biz.dal.dto.HighClassGroupDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
@@ -24,6 +7,15 @@ import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
 
 @RequestMapping("classGroup")
 @Api(tags = "班级服务")
@@ -98,6 +90,12 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.findAllMixClassGroupByMusicGroupId(musicGroupId));
     }
 
+    @ApiOperation(value = "乐团所有班列表")
+    @GetMapping("/findAllClassGroupByMusicGroup")
+    public Object findAllClassGroupByMusicGroup(@ApiParam(value = "乐团编号", required = true) @RequestParam Long musicGroupId) {
+        return succeed(classGroupService.findAllClassGroupByMusicGroup(musicGroupId));
+    }
+
     @ApiOperation(value = "乐团班级老师设置")
     @GetMapping("/addClassGroupTeacher")
     public Object addClassGroupTeacher(@ApiParam(value = "乐团班级老师json", required = true) @RequestParam List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {

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

@@ -1,20 +1,17 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 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 com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
-import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.Date;
 
 @Api(tags = "vip课默认排课周期")
 @RequestMapping("vipGroupDefaultClassesCycle")
@@ -25,29 +22,26 @@ public class VipGroupDefaultClassesCycleController extends BaseController {
 	private VipGroupDefaultClassesCycleService vipGroupDefaultClassesCycleService;
 
 	@ApiOperation("单查询")
-	@GetMapping(value = "/query", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/query")
 	public Object query(int id) {
 		return succeed(vipGroupDefaultClassesCycleService.get(id));
 	}
 
 	@ApiOperation("全查询")
-	@GetMapping(value = "/queryAll", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/queryAll")
 	public Object queryAll() {
 		return succeed(vipGroupDefaultClassesCycleService.findAll(null));
 	}
 
 	@ApiOperation("新增")
-	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/add")
 	public Object add(VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle) {
-		Date date = new Date();
-		vipGroupDefaultClassesCycle.setCreateTime(date);
-		vipGroupDefaultClassesCycle.setUpdateTime(date);
 		vipGroupDefaultClassesCycleService.insert(vipGroupDefaultClassesCycle);
 		return succeed();
 	}
 
 	@ApiOperation("修改")
-	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/update")
 	public Object update(VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle) {
 		Date date = new Date();
 		vipGroupDefaultClassesCycle.setUpdateTime(date);
@@ -56,7 +50,7 @@ public class VipGroupDefaultClassesCycleController extends BaseController {
 	}
 
 	@ApiOperation("删除")
-	@PostMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/delete")
 	public Object delete(int id) {
 		vipGroupDefaultClassesCycleService.delete(id);
 		return succeed();

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

@@ -1,20 +1,17 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 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 com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
-import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.Date;
 
 @Api(tags = "vip课默认单价")
 @RequestMapping("vipGroupDefaultClassesUnitPrice")
@@ -25,19 +22,19 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 	private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
 
 	@ApiOperation("单查询")
-	@GetMapping(value = "/query", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/query")
 	public Object query(int id) {
 		return succeed(vipGroupDefaultClassesUnitPriceService.get(id));
 	}
 
 	@ApiOperation("全查询")
-	@GetMapping(value = "/queryAll", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/queryAll")
 	public Object queryAll() {
 		return succeed(vipGroupDefaultClassesUnitPriceService.findAll(null));
 	}
 
 	@ApiOperation("新增")
-	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/add")
 	public Object add(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
 		Date date = new Date();
 		vipGroupDefaultClassesUnitPrice.setCreateTime(date);
@@ -47,7 +44,7 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 	}
 
 	@ApiOperation("修改")
-	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/update")
 	public Object update(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
 		Date date = new Date();
 		vipGroupDefaultClassesUnitPrice.setUpdateTime(date);
@@ -56,7 +53,7 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 	}
 
 	@ApiOperation("删除")
-	@PostMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/delete")
 	public Object delete(int id) {
 		vipGroupDefaultClassesUnitPriceService.delete(id);
 		return succeed();