Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -44,7 +44,6 @@ public class RoleController extends BaseController {
 	private SysUserRoleService sysUserRoleService;
 
 	@GetMapping(value = "/queryRoleCodeListByUserId")
-    @PreAuthorize("@pcs.hasPermissions('role/queryRoleCodeListByUserId')")
 	public Object queryRoleCodeListByUserId(Integer userId) {
 		return sysUserRoleService.queryRoleCodeListByUserId(userId);
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -7,16 +7,13 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityUtils;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.util.LinkedMultiValueMap;
@@ -68,7 +65,6 @@ public class TokenController extends BaseController {
 
 	@ApiOperation(value = "获取用户信息")
     @GetMapping("/api/queryUserInfo")
-    @PreAuthorize("@pcs.hasPermissions('/api/queryUserInfo')")
     public Object apiQueryUserInfo() {
 		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
@@ -88,7 +84,6 @@ public class TokenController extends BaseController {
     }
 
 	@PostMapping(value = "/refreshToken",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('refreshToken')")
 	@ApiOperation(value = "刷新token")
 	public HttpResponseResult refreshToken(String refreshToken, String clientId, String clientSecret) throws IOException {
 		String url = "http://auth-server/oauth/token";
@@ -111,7 +106,6 @@ public class TokenController extends BaseController {
 	}
 
 	@PostMapping(value = "exit",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('exit')")
 	@ApiOperation(value = "退出登录")
 	public HttpResponseResult logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION) String authHeader) {
 		if (StringUtils.isBlank(authHeader)) {

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

@@ -272,4 +272,12 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<Map<Integer, String>> queryNamesByClassId(@Param("classGroupIds") String classGroupIds);
+    /**
+     * @describe 查询班级下所有学生的部门编号列表
+     * @author Joburgess
+     * @date 2019/10/21
+     * @param classGroupId: 班级编号
+     * @return java.util.List<java.lang.Integer>
+     */
+    List<Integer> findStudentOrganIdsByClassGroup(Long classGroupId);
 }

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

@@ -11,77 +11,81 @@ import java.util.Map;
 
 public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStudentMapper> {
 
-	/**
-	 * 批量插入学生
-	 * @param classGroupStudentMapperList
-	 * @return
-	 */
-	int classGroupStudentsInsert(@Param("classGroupStudentMapperList") List<ClassGroupStudentMapper> classGroupStudentMapperList);
+    /**
+     * 批量插入学生
+     *
+     * @param classGroupStudentMapperList
+     * @return
+     */
+    int classGroupStudentsInsert(@Param("classGroupStudentMapperList") List<ClassGroupStudentMapper> classGroupStudentMapperList);
 
-	/**
-	 * 根据班级和学生编号查询
-	 * @param classGroupId
-	 * @param userId
-	 * @return
-	 */
-	ClassGroupStudentMapper query(@Param("classGroupId") int classGroupId, @Param("userId") Integer userId);
+    /**
+     * 根据班级和学生编号查询
+     *
+     * @param classGroupId
+     * @param userId
+     * @return
+     */
+    ClassGroupStudentMapper query(@Param("classGroupId") int classGroupId, @Param("userId") Integer userId);
 
-	/**
-	 * 根据乐团编号删除指定学生
-	 * @param musicGroupId 乐团编号
-	 * @param userId 学生编号
-	 * @return
-	 */
-	int deleteStudentByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
+    /**
+     * 根据乐团编号删除指定学生
+     *
+     * @param musicGroupId 乐团编号
+     * @param userId       学生编号
+     * @return
+     */
+    int deleteStudentByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 
-	/**
-	 * 根据班级编号删除关联
-	 * @param classGroupId
-	 */
-	void deleteByClassId(Integer classGroupId);
+    /**
+     * 根据班级编号删除关联
+     *
+     * @param classGroupId
+     */
+    void deleteByClassId(Integer classGroupId);
 
-	/**
-	 * @Author: Joburgess
-	 * @Date: 2019/10/17
-	 * @params [classGroupId, userId]
-	 * @return int
-	 * @describe 删除班级上的指定学生
-	 */
-	int deleteStudentByClassGroupId(@Param("classGroupId") Long classGroupId,@Param("userId") Long userId);
+    /**
+     * @return int
+     * @Author: Joburgess
+     * @Date: 2019/10/17
+     * @params [classGroupId, userId]
+     * @describe 删除班级上的指定学生
+     */
+    int deleteStudentByClassGroupId(@Param("classGroupId") Long classGroupId, @Param("userId") Long userId);
 
-	/**
-	 * @describe 根据班级编号获取班级学生名称列表
-	 * @author Joburgess
-	 * @date 2019/10/18
-	 * @param classGroupId: 班级编号
-	 * @return java.lang.String[]
-	 */
-	String[] findStudentNumByClassGroupId(@Param("classGroupId") Long classGroupId);
+    /**
+     * @param classGroupId: 班级编号
+     * @return java.lang.String[]
+     * @describe 根据班级编号获取班级学生名称列表
+     * @author Joburgess
+     * @date 2019/10/18
+     */
+    String[] findStudentNumByClassGroupId(@Param("classGroupId") Long classGroupId);
 
-	/**
-	 * @describe 获取班级学生
-	 * @author Joburgess
-	 * @date 2019/10/18
-	 * @param params:
-	 * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassStudentDto>
-	 */
-	List<TeacherClassStudentDto> findClassStudent(Map<String,Object> params);
+    /**
+     * @param params:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassStudentDto>
+     * @describe 获取班级学生
+     * @author Joburgess
+     * @date 2019/10/18
+     */
+    List<TeacherClassStudentDto> findClassStudent(Map<String, Object> params);
 
-	/**
-	 * @describe 统计班级学生数量
-	 * @author Joburgess
-	 * @date 2019/10/18
-	 * @param params:
-	 * @return int
-	 */
-	int findClassStudentNum(Map<String,Object> params);
+    /**
+     * @param params:
+     * @return int
+     * @describe 统计班级学生数量
+     * @author Joburgess
+     * @date 2019/10/18
+     */
+    int findClassStudentNum(Map<String, Object> params);
 
-	/**
-	 * @describe 获取点名列表
-	 * @author Joburgess
-	 * @date 2019/10/19
-	 * @param courseScheduleId: 课程编号
-	 * @return java.util.List<com.ym.mec.biz.dal.entity.StudentAttendance>
-	 */
-	List<StudentAttendanceViewDto> findStudentByCourse(Long courseScheduleId);
+    /**
+     * @param courseScheduleId: 课程编号
+     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentAttendance>
+     * @describe 获取点名列表
+     * @author Joburgess
+     * @date 2019/10/19
+     */
+    List<StudentAttendanceViewDto> findStudentByCourse(Long courseScheduleId);
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +28,7 @@ public interface CourseHomeworkDao extends BaseDAO<Long, CourseHomework> {
      * @param userId: 用户编号
      * @return com.ym.mec.biz.dal.entity.CourseHomework
      */
-    CourseHomework findByTeacherAndCourseHomewok(Long courseHomeworkId,
-                                                 Long userId);
+    CourseHomework findByTeacherAndCourseHomewok(@Param("courseHomeworkId") Long courseHomeworkId,
+                                                 @Param("userId") Long userId);
 
 }

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.StudentStatusCountUtilEntity;
 import com.ym.mec.biz.dal.entity.StudentAttendance;
 import com.ym.mec.common.dal.BaseDAO;
 
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -21,6 +22,16 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
     int addStudentAttendances(List<StudentAttendance> studentAttendances);
 
     /**
+     * @describe 根据课程删除对应的点名记录
+     * @author Joburgess
+     * @date 2019/10/21
+     * @param courseScheduleId:
+     * @return int
+     */
+    @Delete("delete from student_attendance where course_schedule_id_=#{courseScheduleId}")
+    int deleteStudentAttendancesByCourse(Long courseScheduleId);
+
+    /**
      * 统计学生各种状态人数
      * @param classId
      * @return

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

@@ -28,7 +28,7 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @Date: 2019/10/3
      * 根据学生vip课获取缴费订单
      */
-    StudentPaymentOrder findByStudentVipGroup(@Param("vipGroupId") Long vipGroupId, @Param("userId") Long userId);
+    StudentPaymentOrder findByStudentVipGroup(@Param("vipGroupId") Long vipGroupId, @Param("userId") Integer userId);
 
     /**
      * 查询乐团报名的订单

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

@@ -13,6 +13,15 @@ import java.util.Map;
 public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 
 	/**
+	 * @describe 锁定指定vip课
+	 * @author Joburgess
+	 * @date 2019/10/21
+	 * @param vipGroupId: vip课编号
+	 * @return com.ym.mec.biz.dal.entity.VipGroup
+	 */
+	VipGroup getLockVipGroup(Long vipGroupId);
+
+	/**
 	 * @Author: Joburgess
 	 * @Date: 2019/10/9
 	 * @params [organId]
@@ -160,13 +169,22 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
     List<Map<String,Integer>> countSurplusClassTimes(Long vipGroupId);
 
     /**
+     * @describe 统计vip课已上课程数量
+     * @author Joburgess
+     * @date 2019/10/21
+     * @param vipGroupIds: vip课编号列表
+     * @return java.util.List<java.util.Map<java.lang.Long,java.lang.Integer>>
+     */
+    List<Map<Long,Integer>> countVipGroupOverCourse(List<Long> vipGroupIds);
+
+    /**
      * @Author: Joburgess
      * @Date: 2019/10/12
      * @params [vipGroupId]
      * @return java.math.BigDecimal
      * @describe 统计学生vip课未上课时费用
      */
-    List<Map<Long,BigDecimal>> countSurplusCourseFee(Long vipGroupId);
+    List<Map<Integer,BigDecimal>> countSurplusCourseFee(Long vipGroupId);
 
     /**
      * @Author: Joburgess

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

@@ -0,0 +1,92 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 班级调整
+ */
+public class ClassGroupAdjustDto {
+
+    @ApiModelProperty(value = "乐团id", required = true)
+    private String musicGroupId;
+
+    @ApiModelProperty(value = "班级名称", required = true)
+    private String classGroupName;
+
+    @ApiModelProperty(value = "学生-班级", required = true)
+    private List<ClassGroupStudentMapperDto> classGroupStudentMapperDtoList;
+
+    @ApiModelProperty(value = "老师设置", required = true)
+    private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
+
+    @ApiModelProperty(value = "是否永久 方式1-永久 0-临时", required = true)
+    private YesOrNoEnum type;
+
+    @ApiModelProperty(value = "开始时间", required = true)
+    private LocalDateTime startDate;
+
+    @ApiModelProperty(value = "结束时间", required = true)
+    private LocalDateTime endDate;
+
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
+
+    public YesOrNoEnum getType() {
+        return type;
+    }
+
+    public void setType(YesOrNoEnum type) {
+        this.type = type;
+    }
+
+    public LocalDateTime getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDateTime startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDateTime getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDateTime endDate) {
+        this.endDate = endDate;
+    }
+
+    public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
+        return classGroupTeacherMapperList;
+    }
+
+    public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
+        this.classGroupTeacherMapperList = classGroupTeacherMapperList;
+    }
+
+    public List<ClassGroupStudentMapperDto> getClassGroupStudentMapperDtoList() {
+        return classGroupStudentMapperDtoList;
+    }
+
+    public void setClassGroupStudentMapperDtoList(List<ClassGroupStudentMapperDto> classGroupStudentMapperDtoList) {
+        this.classGroupStudentMapperDtoList = classGroupStudentMapperDtoList;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
+import io.swagger.annotations.ApiModelProperty;
+
+public class ClassGroupStudentMapperDto extends ClassGroupStudentMapper {
+    @ApiModelProperty(value = "科目编号",required = true)
+    private Integer actual_subject_id_;
+
+    public Integer getActual_subject_id_() {
+        return actual_subject_id_;
+    }
+
+    public void setActual_subject_id_(Integer actual_subject_id_) {
+        this.actual_subject_id_ = actual_subject_id_;
+    }
+}

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

@@ -20,6 +20,9 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "学生总人数")
     private Integer totalStudentNum;
 
+    @ApiModelProperty(value = "学生姓名")
+    private String studentNames;
+
     @ApiModelProperty(value = "学校名称",required = false)
     private String schoolName;
 
@@ -32,6 +35,14 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "签退状态(1已签到，0未签到)",required = false)
     private Integer signOutStatus;
 
+    public String getStudentNames() {
+        return studentNames;
+    }
+
+    public void setStudentNames(String studentNames) {
+        this.studentNames = studentNames;
+    }
+
     public Integer getTotalStudentNum() {
         return totalStudentNum;
     }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +18,7 @@ public class HighClassGroupDto extends ClassGroup {
 	private Integer userId;
 
 	@ApiModelProperty(value = "星期几",required = true)
-	private String dayOfWeek;
+	private Integer dayOfWeek;
 
 	@ApiModelProperty(value = "开始时间",required = true)
 	private String startClassTime;
@@ -26,7 +27,7 @@ public class HighClassGroupDto extends ClassGroup {
 	private String endClassTime;
 
 	@ApiModelProperty(value = "开始日期", required = true)
-	private Date StartDate;
+	private String startDate;
 
 	@ApiModelProperty(value = "排课次数", required = true)
 	private Integer courseTimes;
@@ -62,22 +63,14 @@ public class HighClassGroupDto extends ClassGroup {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-	public String getDayOfWeek() {
+	public Integer getDayOfWeek() {
 		return dayOfWeek;
 	}
 
-	public void setDayOfWeek(String dayOfWeek) {
+	public void setDayOfWeek(Integer dayOfWeek) {
 		this.dayOfWeek = dayOfWeek;
 	}
 
-	public Date getStartDate() {
-		return StartDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		StartDate = startDate;
-	}
-
 	public Integer getCourseTimes() {
 		return courseTimes;
 	}
@@ -85,4 +78,12 @@ public class HighClassGroupDto extends ClassGroup {
 	public void setCourseTimes(Integer courseTimes) {
 		this.courseTimes = courseTimes;
 	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
 }

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

@@ -24,6 +24,9 @@ public class StudentCourseHomeworkCommentDto {
     @ApiModelProperty(value = "头像")
     private String avatar;
 
+    @ApiModelProperty(value = "是否是教师")
+    private Integer isTeacher;
+
     /** 留言内容 */
     @ApiModelProperty(value = "留言内容",required = true)
     private String content;
@@ -34,6 +37,14 @@ public class StudentCourseHomeworkCommentDto {
     @ApiModelProperty(value = "回复",required = false)
     private List<StudentCourseHomeworkCommentDto> replys;
 
+    public Integer getIsTeacher() {
+        return isTeacher;
+    }
+
+    public void setIsTeacher(Integer isTeacher) {
+        this.isTeacher = isTeacher;
+    }
+
     public String getAvatar() {
         return avatar;
     }

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

@@ -74,6 +74,17 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "教学形式")
     private Integer classMode;
 
+    @ApiModelProperty(value = "每月平均课时")
+    private double avgClassTimesOfMonth;
+
+    public double getAvgClassTimesOfMonth() {
+        return avgClassTimesOfMonth;
+    }
+
+    public void setAvgClassTimesOfMonth(double avgClassTimesOfMonth) {
+        this.avgClassTimesOfMonth = avgClassTimesOfMonth;
+    }
+
     public Integer getClassMode() {
         return classMode;
     }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.Date;
 
@@ -19,6 +20,9 @@ public class TeacherHomeworkListDto {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    @JsonIgnore
+    private String day;
+
     @ApiModelProperty(value = "预计完成人数")
     private Integer expectNum;
 
@@ -40,6 +44,14 @@ public class TeacherHomeworkListDto {
     @ApiModelProperty(value = "乐团名称")
     private String musicGroupName;
 
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+
     public Integer getCourseScheduleId() {
         return courseScheduleId;
     }

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

@@ -19,6 +19,9 @@ public class StudentCourseHomework {
 
 	@ApiModelProperty(value = "用户名")
 	private String userName;
+
+	@ApiModelProperty(value = "头像")
+	private String avatar;
 	
 	/**  */
 	private Long courseHomeworkId;
@@ -35,6 +38,14 @@ public class StudentCourseHomework {
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getAvatar() {
+		return avatar;
+	}
+
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+
 	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
 

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

@@ -78,8 +78,8 @@ public class StudentRegistration {
     @ApiModelProperty(value = "用户所在乐团状态）",required = false)
     private ClassGroupStudentStatusEnum musicGroupStatus;
 
-    @ApiModelProperty(value = "班级id", hidden = true)
-    private Integer classGroupId;
+    @ApiModelProperty(value = "班级ids", hidden = true)
+    private String classGroupId;
 
     @ApiModelProperty(value = "零时课程费用", hidden = true)
     private BigDecimal temporaryCourseFee;
@@ -228,11 +228,11 @@ public class StudentRegistration {
         return paymentStatus;
     }
 
-    public Integer getClassGroupId() {
+    public String getClassGroupId() {
         return classGroupId;
     }
 
-    public void setClassGroupId(Integer classGroupId) {
+    public void setClassGroupId(String classGroupId) {
         this.classGroupId = classGroupId;
     }
 

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

@@ -100,7 +100,29 @@ public class VipGroup {
 	private TeachModeEnum giveTeachMode;
 	
 	private Integer organId;
-	
+
+	@ApiModelProperty(value = "取消原因")
+	private String stopReason;
+
+	@ApiModelProperty(value = "月度消耗百分数")
+	private Double monthConsumeRate;
+
+	public Double getMonthConsumeRate() {
+		return monthConsumeRate;
+	}
+
+	public void setMonthConsumeRate(Double monthConsumeRate) {
+		this.monthConsumeRate = monthConsumeRate;
+	}
+
+	public String getStopReason() {
+		return stopReason;
+	}
+
+	public void setStopReason(String stopReason) {
+		this.stopReason = stopReason;
+	}
+
 	public String getVipGroupActivityName() {
 		return vipGroupActivityName;
 	}

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

@@ -6,31 +6,31 @@ 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;
+    private String code;
 
-	private String msg;
+    private String msg;
 
-	ClassGroupStudentStatusEnum(String code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
+    ClassGroupStudentStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
 
-	public void setCode(String code) {
-		this.code = code;
-	}
+    public void setCode(String code) {
+        this.code = code;
+    }
 
-	public String getMsg() {
-		return msg;
-	}
+    public String getMsg() {
+        return msg;
+    }
 
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
 
-	@Override
-	public String getCode() {
-		return this.code;
-	}
+    @Override
+    public String getCode() {
+        return this.code;
+    }
 }

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

@@ -237,4 +237,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return java.util.List<com.ym.mec.biz.dal.dto.StudentAttendanceViewDto>
      */
     List<StudentAttendanceViewDto> findAttendanceStudentByCourse(Long courseScheduleId);
+
+    /**
+     * 班级调整
+     * @param classGroupAdjustDto
+     * @return
+     */
+    ClassGroup classGroupAdjust(ClassGroupAdjustDto classGroupAdjustDto) throws Exception;
 }

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

@@ -2,9 +2,11 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 public interface CourseHomeworkService extends BaseService<Long, CourseHomework> {
 
     /**
@@ -14,6 +16,6 @@ public interface CourseHomeworkService extends BaseService<Long, CourseHomework>
      * @param queryInfo:
      * @return com.ym.mec.common.page.PageInfo
      */
-    PageInfo findTeacherCourseHomeworkByClassGroup(CourseHomeworkQueryInfo queryInfo);
+    List<Map<String,Object>> findTeacherCourseHomeworkByClassGroup(CourseHomeworkQueryInfo queryInfo);
 
 }

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
+import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
@@ -155,13 +156,16 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
     void courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints);
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/3
-     * @params [courseScheduleComplaints]
-     * @return void
-     * @describe 课程投诉审核
-     */
-    void courseScheduleCommplaintAudit(CourseScheduleComplaints courseScheduleComplaints);
+	 * @Author: Joburgess
+	 * @Date: 2019/10/3
+	 * @params [id] 申诉编号
+	 * @params [teacherLiabilityRatio] 老师责任比
+	 * @params [studentLiabilityRatio] 学生责任比
+	 * @params [status] 审批状态
+	 * @return void
+	 * @describe 课程投诉审核
+	 */
+	void courseScheduleCommplaintAudit(Long id, Double teacherLiabilityRatio, Double studentLiabilityRatio, AuditStatusEnum status);
     
     /**
      * 更新课程至结束状态

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

@@ -5,13 +5,13 @@ import com.ym.mec.common.service.BaseService;
 
 public interface CourseScheduleStudentPaymentService extends BaseService<Long, CourseScheduleStudentPayment> {
 
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/14
-     * @params [vipGroupId, userId]
-     * @return int
-     * @describe 生成学生vip课单节课时收费信息
-     */
-    int createCourseScheduleStudentPaymentForVipGroup(Long vipGroupId,Long userId);
+	/**
+	 * @Author: Joburgess
+	 * @Date: 2019/10/14
+	 * @params [vipGroupId, userId]
+	 * @return int
+	 * @describe 生成学生vip课单节课时收费信息
+	 */
+	int createCourseScheduleStudentPaymentForVipGroup(Long vipGroupId, Integer userId);
 
 }

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

@@ -42,20 +42,20 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
     PageInfo findVipGroups(VipGroupQueryInfo queryInfo);
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/9
-     * @params [queryInfo]
-     * @return com.ym.mec.common.page.PageInfo
      * @describe 获取vip课教学记录
+     * @author Joburgess
+     * @date 2019/10/21
+     * @param queryInfo: 查询条件
+     * @return java.util.Map<java.lang.String,java.lang.Object>
      */
     Map<String, Object> findVipGroupTeachingRecord(VipGroupTeachingRecordQueryInfo queryInfo);
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/9
-     * @params [vipGroupId]
-     * @return com.ym.mec.biz.dal.dto.TeachingRecordBaseInfo
      * @describe 获取vip课教学记录基本信息
+     * @author Joburgess
+     * @date 2019/10/21
+     * @param vipGroupId: vip课编号
+     * @return com.ym.mec.biz.dal.dto.TeachingRecordBaseInfo
      */
     TeachingRecordBaseInfo findTeachingRecordBaseInfo(Long vipGroupId);
 
@@ -142,13 +142,13 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
     void orderCallback(String callbackParams);
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/3
-     * @params [vipGroupId, studentId]
-     * @return void
-     * @describe 申请退课
-     */
-    void applyRefund(Long vipGroupId,Long studentId);
+	 * @Author: Joburgess
+	 * @Date: 2019/10/3
+	 * @params [vipGroupId, studentId]
+	 * @return void
+	 * @describe 申请退课
+	 */
+	void applyRefund(Long vipGroupId, Integer studentId);
 
     /**
      * @Author: Joburgess
@@ -178,13 +178,14 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
     List<String> findVipGroupAttendanceStudents(Long courseScheduleId);
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/12
-     * @params [vipGroupId]
-     * @return void
      * @describe 停止vip课
+     * @author Joburgess
+     * @date 2019/10/21
+     * @param vipGroupId: vip课编号
+     * @param stopReason: 取消原因
+     * @return void
      */
-    void stopGroup(Long vipGroupId);
+    void stopGroup(Long vipGroupId,String stopReason);
 
     /**
      * 发放月度奖励

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

@@ -21,15 +21,19 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.datetime.DateFormatter;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.text.DateFormat;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -68,6 +72,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private SubjectService subjectService;
     @Autowired
     private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -131,7 +137,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
             classGroupStudentList.add(classGroupStudentMapper);
             StudentRegistration studentRegistration = new StudentRegistration();
-            studentRegistration.setClassGroupId(classGroup.getId());
+            studentRegistration.setClassGroupId(classGroup.getId().toString());
             studentRegistration.setUserId(Integer.getInteger(userId));
             studentRegistration.setMusicGroupId(classGroup.getMusicGroupId());
             studentRegistrationDao.updateByUserIdAndMusicGroupId(studentRegistration);
@@ -205,6 +211,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             highClassGroup.setCreateTime(date);
             highClassGroup.setUpdateTime(date);
             highClassGroup.setType(ClassGroupTypeEnum.HIGH);
+            highClassGroup.setTotalClassTimes(highClassGroup.getCourseTimes());
+            highClassGroup.setCurrentClassTimes(0);
             insert(highClassGroup);
 
             //2、插入班级关联老师
@@ -219,21 +227,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             //3、插入班级排课信息
             List<CourseSchedule> courseScheduleList = new ArrayList<>();
-            int i = 0;
-            LocalDateTime now = LocalDateTime.ofInstant(highClassGroup.getStartDate().toInstant(), ZoneId.systemDefault());
+            int times = 0;
+            //LocalDateTime now = LocalDateTime.ofInstant(highClassGroup.getStartDate().toInstant(), ZoneId.systemDefault());
+            LocalDateTime now = LocalDate.parse(highClassGroup.getStartDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
+
             while (true) {
-                now = now.plusDays(i);
                 int dayOfWeek = now.getDayOfWeek().getValue();
-
                 if (highClassGroup.getDayOfWeek().equals(dayOfWeek)) {
                     CourseSchedule courseSchedule = new CourseSchedule();
                     Instant instant = now.atZone(ZoneId.systemDefault()).toInstant();
                     Date classDate = Date.from(instant);
-                    String startClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getStartClassTime();
-                    String endClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getEndClassTime();
+                    String startClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getStartClassTime()+":00";
+                    String endClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getEndClassTime()+":00";
 
                     courseSchedule.setSchoolId(schoolId);
-                    courseSchedule.setClassGroupId(highClassGroup.getUserId());
+                    courseSchedule.setClassGroupId(highClassGroup.getId());
                     courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                     courseSchedule.setClassDate(classDate);
                     courseSchedule.setStartClassTime(DateUtil.stringToDate(startClassTime));
@@ -243,14 +251,19 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseSchedule.setCreateTime(date);
                     courseSchedule.setUpdateTime(date);
                     courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
+                    courseSchedule.setType(CourseSchedule.CourseScheduleType.HIGH);
+                    Subject subject = subjectService.get(Integer.parseInt(highClassGroup.getSubjectIdList()));
+                    courseSchedule.setName(subject.getName()+"-"+CourseSchedule.CourseScheduleType.HIGH.getMsg());
+
                     courseScheduleList.add(courseSchedule);
-                    i++;
+                    times++;
                 }
-                if (highClassGroup.getCourseTimes().equals(i)) {
+                now = now.plusDays(1);
+                if (highClassGroup.getCourseTimes().equals(times)) {
                     break;
                 }
             }
-            courseScheduleService.batchAddCourseSchedule(courseScheduleList);
+            courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
         }
         return highClassGroupList;
     }
@@ -296,14 +309,22 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             List<Map<Integer,String>> names = vipGroupActivityDao.queryNamesById(StringUtils.join(activityIds,","));
             Map<Integer,String> nameMap = MapUtil.convertMybatisMap(names);
             //计算月度平均消耗值(已上课时 / 消耗月份)
-            Date date = new Date();
-            dataList.forEach(e->{
-                e.setActivityName(nameMap.get(e.getActivityId()));
-                int days = DateUtil.daysBetween(e.getPaymentExpireDate(), date);
-                if(days <= 0){
-                    e.setMonthAvg(0f);
-                }else {
-                    e.setMonthAvg(e.getCurrentClassTimes()/(days/30));
+            List<Long> vipGroupIds = dataList.stream().map(vipGroup -> vipGroup.getVipClassId()).collect(Collectors.toList());
+            List<Map<Long, Integer>> vipGroupOverCourses = vipGroupDao.countVipGroupOverCourse(vipGroupIds);
+            Map<Long,Integer> vipGroupOverCourseMaps = MapUtil.convertMybatisMap(vipGroupOverCourses);
+            dataList.forEach(vipGroup -> {
+                Integer overCourses = vipGroupOverCourseMaps.get(vipGroup.getVipClassId());
+                if(Objects.isNull(overCourses)){
+                    overCourses=0;
+                }
+                Integer totalClassTimes=vipGroup.getTotalClassTimes();
+                if(Objects.isNull(totalClassTimes)){
+                    vipGroup.setMonthAvg(Float.parseFloat("0.0"));
+                }else{
+                    BigDecimal overCoursesOfMonth=new BigDecimal(overCourses),allClassTimes=new BigDecimal(totalClassTimes);
+
+                    Float monthConsumeRate=overCoursesOfMonth.divide(overCoursesOfMonth,2,BigDecimal.ROUND_HALF_UP).floatValue();
+                    vipGroup.setMonthAvg(monthConsumeRate);
                 }
             });
 
@@ -336,7 +357,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) throws Exception {
         //乐团班级及班级老师
-        List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId,"NORMAL,MIX,HIGH");
+        List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId, "NORMAL,MIX,HIGH");
 
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
             //班级的教师列表
@@ -346,7 +367,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);
                 if (teacherSalaryByUserIdAndType == null) {
-                    throw new Exception("userId："+classGroupTeacherMapper.getUserId()+"名字："+classGroupTeacherMapper.getUserName()+" 老师没有设置课酬");
+                    throw new Exception("userId：" + classGroupTeacherMapper.getUserId() + "名字：" + classGroupTeacherMapper.getUserName() + " 老师没有设置课酬");
                 }
                 classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
             }
@@ -368,19 +389,19 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             params.put("offset", pageInfo.getOffset());
             courseListDtos = classGroupDao.queryCoursePage(params);
             courseListDtos.forEach(e -> {
-                if (ClassGroupTypeEnum.VIP==e.getType()) {
+                if (ClassGroupTypeEnum.VIP == e.getType()) {
                     //获取vip课的学生名称列表
                     List<String> vipStuNames = classGroupDao.findVipStuNames(e.getMusicGroupId());
                     if (vipStuNames != null && vipStuNames.size() > 0) {
                         e.setStudentNames(StringUtils.join(vipStuNames, ","));
                     }
-                    if(e.getOffLineClassesNum()>0&&e.getOffLineClassesNum()<=0){
+                    if (e.getOffLineClassesNum() > 0 && e.getOffLineClassesNum() <= 0) {
                         e.setClassMode(1);
-                    }else if(e.getOffLineClassesNum()>0&&e.getOffLineClassesNum()>0){
+                    } else if (e.getOffLineClassesNum() > 0 && e.getOffLineClassesNum() > 0) {
                         e.setClassMode(3);
-                    }else if(e.getOnlineClassesNum()<0&&e.getOffLineClassesNum()>=0){
+                    } else if (e.getOnlineClassesNum() < 0 && e.getOffLineClassesNum() >= 0) {
                         e.setClassMode(2);
-                    }else{
+                    } else {
                         e.setClassMode(0);
                     }
                 } else {
@@ -422,7 +443,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 teachers.removeAll(Collections.singleton(null));
                 //获取乐团群用户总数
                 BigDecimal count = musicGroupUserNumMap.get(e.getId());
-                e.setCount(count == null?0:count.intValue() + teachers.size());
+                e.setCount(count == null ? 0 : count.intValue() + teachers.size());
                 e.setId("mg" + e.getId());
             });
         } else {
@@ -432,11 +453,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         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,","));
+            List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
             Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
             imGroupModels1.forEach(e -> {
                 Integer num = numsMap.get(e.getId());
-                e.setCount(num == null?0:num + e.getCount());
+                e.setCount(num == null ? 0 : num + e.getCount());
                 e.setId("cg" + e.getId());
             });
             imGroupModels.addAll(imGroupModels1);
@@ -513,15 +534,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addMusicGroupTeam(Integer teacherId, String musicGroupId,Integer improventClassesNum) throws Exception {
+    public void addMusicGroupTeam(Integer teacherId, String musicGroupId, Integer improventClassesNum) throws Exception {
         //所有学员都已经分配
         List<StudentRegistration> students = studentRegistrationDao.getNoClassStuBySubjectId(musicGroupId, null);
-        if(students != null && students.size() > 0){
+        if (students != null && students.size() > 0) {
             throw new Exception("还有学员未分配班级");
         }
         //所有单技班都有合奏班
         List<ClassGroup> classGroupList = classGroupDao.findNoClassSubjects(musicGroupId);
-        if(classGroupList != null && classGroupList.size() > 0){
+        if (classGroupList != null && classGroupList.size() > 0) {
             throw new Exception("还有单技班未分配合奏");
         }
         //设置教学主管
@@ -536,12 +557,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public List<TeacherClassGroupDto> findTeacherClassGroups(String type) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(user)){
+        if (Objects.isNull(user)) {
             throw new BizException("请登录");
         }
 
         List<TeacherClassGroupDto> teacherMusicClassGroup;
-        switch (type){
+        switch (type) {
             case "VIP":
                 teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue());
                 break;
@@ -551,7 +572,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             default:
                 throw new BizException("请指定课程类型");
         }
-        if(CollectionUtils.isEmpty(teacherMusicClassGroup)){
+        if (CollectionUtils.isEmpty(teacherMusicClassGroup)) {
             return teacherMusicClassGroup;
         }
 
@@ -562,32 +583,50 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<Map<Long, Integer>> musicGroupIdAndNumList = musicGroupStudentFeeDao.countContinuosAbsenteeismStudentNum(musicGroupIds);
         Map<Long, Integer> musicGroupIdAndNum = MapUtil.convertMybatisMap(musicGroupIdAndNumList);
 
+        List<Map<Long, Integer>> vipGroupOverCourses = vipGroupDao.countVipGroupOverCourse(musicGroupIds);
+        Map<Long,Integer> vipGroupOverCourseMaps = MapUtil.convertMybatisMap(vipGroupOverCourses);
+
         teacherMusicClassGroup.forEach(teacherClassGroupDto -> {
 
-            if(teacherClassGroupDto.getType()==ClassGroupTypeEnum.VIP){
+            if (teacherClassGroupDto.getType() == ClassGroupTypeEnum.VIP) {
                 String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(teacherClassGroupDto.getClassGroupId());
-                teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums,","));
-                if(teacherClassGroupDto.getOffLineClassesNum()>0&&teacherClassGroupDto.getOffLineClassesNum()<=0){
+                teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums, ","));
+                if (teacherClassGroupDto.getOffLineClassesNum() > 0 && teacherClassGroupDto.getOffLineClassesNum() <= 0) {
                     teacherClassGroupDto.setClassMode(1);
-                }else if(teacherClassGroupDto.getOffLineClassesNum()>0&&teacherClassGroupDto.getOffLineClassesNum()>0){
+                } else if (teacherClassGroupDto.getOffLineClassesNum() > 0 && teacherClassGroupDto.getOffLineClassesNum() > 0) {
                     teacherClassGroupDto.setClassMode(3);
-                }else if(teacherClassGroupDto.getOnlineClassesNum()<0&&teacherClassGroupDto.getOffLineClassesNum()>=0){
+                } else if (teacherClassGroupDto.getOnlineClassesNum() < 0 && teacherClassGroupDto.getOffLineClassesNum() >= 0) {
                     teacherClassGroupDto.setClassMode(2);
-                }else{
+                } else {
                     teacherClassGroupDto.setClassMode(0);
                 }
+
+                Integer overCourses = vipGroupOverCourseMaps.get(teacherClassGroupDto.getMusicGroupId());
+                if(Objects.isNull(overCourses)){
+                    overCourses=0;
+                }
+                Integer totalClassTimes=teacherClassGroupDto.getTotalClassTimes();
+                if(Objects.isNull(totalClassTimes)||totalClassTimes==0){
+                    teacherClassGroupDto.setAvgClassTimesOfMonth(0.0);
+                }else{
+                    BigDecimal overCoursesOfMonth=new BigDecimal(overCourses),allClassTimes=new BigDecimal(totalClassTimes);
+
+                    Double monthConsumeRate=overCoursesOfMonth.divide(allClassTimes,1,BigDecimal.ROUND_HALF_UP).doubleValue();
+                    teacherClassGroupDto.setAvgClassTimesOfMonth(monthConsumeRate);
+                }
+
             }
-            String subjectIdList=teacherClassGroupDto.getSubjectIdList();
-            if(StringUtils.isNotEmpty(subjectIdList)){
-                if(Objects.nonNull(musicGroupIdAndNum)&&Objects.nonNull(musicGroupIdAndNum.get(teacherClassGroupDto.getMusicGroupId()))){
+            String subjectIdList = teacherClassGroupDto.getSubjectIdList();
+            if (StringUtils.isNotEmpty(subjectIdList)) {
+                if (Objects.nonNull(musicGroupIdAndNum) && Objects.nonNull(musicGroupIdAndNum.get(teacherClassGroupDto.getMusicGroupId()))) {
                     teacherClassGroupDto.setThreeClassNoAttendanceStudentNum(musicGroupIdAndNum.get(teacherClassGroupDto.getMusicGroupId()));
                 }
                 String[] subjectIds = subjectIdList.split(",");
-                List<String> subjectNameList=new ArrayList<>();
+                List<String> subjectNameList = new ArrayList<>();
                 for (String subjectId : subjectIds) {
                     subjectNameList.add(subjectMapBySubjectIdsList.get(Integer.parseInt(subjectId)));
                 }
-                teacherClassGroupDto.setSubjectNames(StringUtils.join(subjectNameList,","));
+                teacherClassGroupDto.setSubjectNames(StringUtils.join(subjectNameList, ","));
             }
         });
 
@@ -597,11 +636,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public boolean updateClassStudentNum(Long classGroupId, Integer num) {
-        ClassGroup classGroup=classGroupDao.lockClassGroup(classGroupId);
-        if(Objects.isNull(classGroup)){
+        ClassGroup classGroup = classGroupDao.lockClassGroup(classGroupId);
+        if (Objects.isNull(classGroup)) {
             throw new BizException("班级不存在");
         }
-        classGroup.setStudentNum(classGroup.getStudentNum()+num);
+        classGroup.setStudentNum(classGroup.getStudentNum() + num);
         classGroup.setUpdateTime(new Date());
 
         classGroupDao.update(classGroup);
@@ -611,34 +650,34 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public TeacherClassHeadInfo findTeacherClassGroupInfo(Long classGroupId) {
-        if(Objects.isNull(classGroupId)){
+        if (Objects.isNull(classGroupId)) {
             throw new BizException("请指定班级");
         }
 
         ClassGroup classGroup = classGroupDao.get(classGroupId.intValue());
 
-        if(Objects.isNull(classGroup)){
+        if (Objects.isNull(classGroup)) {
             throw new BizException("未找到该班级");
         }
 
-        TeacherClassHeadInfo teacherClassHeadInfo=new TeacherClassHeadInfo();
+        TeacherClassHeadInfo teacherClassHeadInfo = new TeacherClassHeadInfo();
         teacherClassHeadInfo.setStudentNum(classGroup.getStudentNum());
         teacherClassHeadInfo.setCurrentClassTimes(classGroup.getCurrentClassTimes());
         teacherClassHeadInfo.setTotalClassTimes(classGroup.getTotalClassTimes());
         ClassGroupTeacherMapper bishopTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(classGroupId, TeachTypeEnum.BISHOP);
-        if(Objects.nonNull(bishopTeacher)){
+        if (Objects.nonNull(bishopTeacher)) {
             teacherClassHeadInfo.setBishopTeacherId(bishopTeacher.getId());
             teacherClassHeadInfo.setBishopTeacher(bishopTeacher.getUserName());
         }
         ClassGroupTeacherMapper teachingTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(classGroupId, TeachTypeEnum.TEACHING);
-        if(Objects.nonNull(teachingTeacher)){
+        if (Objects.nonNull(teachingTeacher)) {
             teacherClassHeadInfo.setTeachingTeacherId(teachingTeacher.getId());
             teacherClassHeadInfo.setTeachingTeacher(teachingTeacher.getUserName());
         }
 
-        if(classGroup.getType()==ClassGroupTypeEnum.VIP){
+        if (classGroup.getType() == ClassGroupTypeEnum.VIP) {
             String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(classGroupId);
-            teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums,","));
+            teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
         }
 
         return teacherClassHeadInfo;
@@ -665,9 +704,61 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<StudentAttendanceViewDto> findAttendanceStudentByCourse(Long courseScheduleId) {
-        if(Objects.isNull(courseScheduleId)){
+        if (Objects.isNull(courseScheduleId)) {
             throw new BizException("请指定课程编号");
         }
         return classGroupStudentMapperDao.findStudentByCourse(courseScheduleId);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ClassGroup classGroupAdjust(ClassGroupAdjustDto classGroupAdjustDto) throws Exception {
+        Date date = new Date();
+
+        List<ClassGroupStudentMapperDto> classGroupStudentMapperDtoList = classGroupAdjustDto.getClassGroupStudentMapperDtoList();
+        String subject_id_list_ = "";
+        for (ClassGroupStudentMapper classGroupStudentMapperDto : classGroupStudentMapperDtoList) {
+            //1、永久调整，删除学生班级关联关系
+            if (classGroupAdjustDto.getType().equals(YesOrNoEnum.YES)) {
+                ClassGroupStudentMapper classStudentMapper = classGroupStudentMapperDao.query(classGroupStudentMapperDto.getClassGroupId(), classGroupStudentMapperDto.getUserId());
+                classStudentMapper.setStatus(ClassGroupStudentStatusEnum.QUIT);
+                classGroupStudentMapperDao.update(classStudentMapper);
+            }
+            subject_id_list_ += classGroupStudentMapperDto.getUserId() + ",";
+        }
+
+
+        subject_id_list_ = subject_id_list_.substring(0, subject_id_list_.length() - 1);
+
+        //2、新建班级
+        ClassGroup classGroup = new ClassGroup();
+        classGroup.setMusicGroupId(classGroupAdjustDto.getMusicGroupId());
+        classGroup.setSubjectIdList(subject_id_list_);
+        classGroup.setName(classGroupAdjustDto.getClassGroupName());
+        classGroup.setExpectStudentNum(classGroupStudentMapperDtoList.size());
+        classGroup.setStudentNum(classGroupStudentMapperDtoList.size());
+        classGroup.setType(ClassGroupTypeEnum.NORMAL);
+        classGroup.setDelFlag(YesOrNoEnum.NO);
+        classGroup.setCreateTime(date);
+        classGroup.setUpdateTime(date);
+        classGroupDao.insert(classGroup);
+
+        //3、将学生加入新班级（学生注册表，关联表）
+        List<ClassGroupStudentMapper> classGroupStudentMapperList = new ArrayList<>();
+        for (ClassGroupStudentMapperDto classGroupStudentMapperDto : classGroupStudentMapperDtoList) {
+            classGroupStudentMapperDto.setClassGroupId(classGroup.getId());
+            classGroupStudentMapperList.add(classGroupStudentMapperDto);
+        }
+        classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMapperList);
+
+
+        //4、将老师加入关联关系
+        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAdjustDto.getClassGroupTeacherMapperList();
+        for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+            classGroupTeacherMapper.setClassGroupId(classGroup.getId());
+            classGroupTeacherMapper.setMusicGroupId(classGroupAdjustDto.getMusicGroupId());
+        }
+        classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
+        return classGroup;
+    }
 }

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

@@ -8,14 +8,16 @@ import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkService;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -34,29 +36,31 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 	}
 
 	@Override
-	public PageInfo findTeacherCourseHomeworkByClassGroup(CourseHomeworkQueryInfo queryInfo) {
-		if(Objects.isNull(queryInfo.getClassGroupId())){
-			throw new BizException("请指定班级");
-		}
-		PageInfo<TeacherHomeworkListDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+	public List<Map<String,Object>> findTeacherCourseHomeworkByClassGroup(CourseHomeworkQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		List<TeacherHomeworkListDto> dataList = null;
+		List<Map<String,Object>> result=new ArrayList<>();
 		int count = courseHomeworkDao.countByClassGroupAndTeacher(params);
 		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
 			dataList = courseHomeworkDao.findByClassGroupAndTeacher(params);
 			List<Integer> courseScheduleIds = dataList.stream().map(TeacherHomeworkListDto::getCourseScheduleId).collect(Collectors.toList());
-			Map<Integer, Integer> courseScheduleCurrentTimes = courseScheduleService.findCourseScheduleCurrentTimes(courseScheduleIds);
-			dataList.forEach(teacherHomeworkListDto -> {
-				teacherHomeworkListDto.setCurrentClassTimes(courseScheduleCurrentTimes.get(teacherHomeworkListDto.getCourseScheduleId()));
-			});
+			if(!CollectionUtils.isEmpty(courseScheduleIds)){
+				Map<Integer, Integer> courseScheduleCurrentTimes = courseScheduleService.findCourseScheduleCurrentTimes(courseScheduleIds);
+				dataList.forEach(teacherHomeworkListDto -> {
+					teacherHomeworkListDto.setCurrentClassTimes(courseScheduleCurrentTimes.get(teacherHomeworkListDto.getCourseScheduleId()));
+				});
+			}
 		}
-		if (count == 0) {
-			dataList = new ArrayList<>();
+		if (count != 0) {
+			Map<String, List<TeacherHomeworkListDto>> collect = dataList.stream().collect(Collectors.groupingBy(TeacherHomeworkListDto::getDay));
+			for(String key:collect.keySet()){
+				Map<String,Object> r=new HashMap<>();
+				r.put("day",key);
+				r.put("list",collect.get(key));
+				result.add(r);
+			}
 		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
+		return result;
 	}
 }

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

@@ -2,10 +2,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.CourseScheduleComplaintsDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.StudentAttendanceDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.dto.CourseScheduleDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
@@ -26,6 +23,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.BeanUtils;
@@ -54,7 +52,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	private StudentAttendanceDao studentAttendanceDao;
 	@Autowired
 	private SysConfigService sysConfigService;
-	
+	@Autowired
+	private ClassGroupStudentMapperDao classGroupStudentMapperDao;
 	@Autowired
 	private SysMessageService sysMessageService;
 
@@ -226,7 +225,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(null==user){
 			throw new BizException("请登录");
 		}
-		return courseScheduleDao.getTeacherCourseSchedulesWithDate(classDate,user.getId().longValue());
+		List<CourseScheduleDto> teacherCourseSchedulesWithDate = courseScheduleDao.getTeacherCourseSchedulesWithDate(classDate, user.getId().longValue());
+		teacherCourseSchedulesWithDate.forEach(courseScheduleDto -> {
+			if(Objects.nonNull(courseScheduleDto.getClassGroupId())){
+				String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(courseScheduleDto.getClassGroupId().longValue());
+				courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNums, ","));
+			}
+		});
+		return teacherCourseSchedulesWithDate;
 	}
 
 	/**
@@ -505,14 +511,20 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public void courseScheduleCommplaintAudit(CourseScheduleComplaints courseScheduleComplaints) {
-		if(Objects.isNull(courseScheduleComplaints.getId())){
-			throw new BizException("请指定投诉记录!");
-		}
-		CourseScheduleComplaints newCourseScheduleComplaints=new CourseScheduleComplaints();
-		newCourseScheduleComplaints.setId(courseScheduleComplaints.getId());
-		newCourseScheduleComplaints.setStatus(courseScheduleComplaints.getStatus());
-		courseScheduleComplaintsDao.update(newCourseScheduleComplaints);
+	public void courseScheduleCommplaintAudit(Long id, Double teacherLiabilityRatio, Double studentLiabilityRatio, AuditStatusEnum status) {
+
+		if(status == AuditStatusEnum.ING){
+			throw new BizException("审批状态不正确");
+		}
+		
+		CourseScheduleComplaints courseScheduleComplaints = courseScheduleComplaintsDao.get(id);
+		if (Objects.isNull(courseScheduleComplaints)) {
+			throw new BizException("投诉记录不存在");
+		}
+		courseScheduleComplaints.setTeacherLiabilityRatio(teacherLiabilityRatio);
+		courseScheduleComplaints.setStudentLiabilityRatio(studentLiabilityRatio);
+		courseScheduleComplaints.setStatus(status);
+		courseScheduleComplaintsDao.update(courseScheduleComplaints);
 	}
 
 	@Override

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

@@ -40,7 +40,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 	}
 
 	@Override
-	public int createCourseScheduleStudentPaymentForVipGroup(Long vipGroupId, Long userId) {
+	public int createCourseScheduleStudentPaymentForVipGroup(Long vipGroupId, Integer userId) {
 		VipGroup vipGroupApplyBaseInfoDto=vipGroupDao.get(vipGroupId);
 
 		if(Objects.isNull(vipGroupApplyBaseInfoDto)){

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

@@ -46,19 +46,10 @@ public class PayServiceImpl implements PayService {
         //支付通道决策
         SysAccount routingAccount = getRoutingAccount(amount);
         HashMap<String, Object> unionPay = new HashMap<>();
-        String type = "YQPAY";
         Map payMap;
-//        if (routingAccount != null) {
-//            //易乾支付
-//            payMap = YqPayUtil.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routingAccount.getMerNo());
-//        } else {
-//            type = "UNIONPAY";
-//            payMap = UnionPay.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject);
-//        }
-        type = "UNIONPAY";
         payMap = UnionPay.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject);
         unionPay.put("orderNo", orderNo);
-        unionPay.put("type", type);
+        unionPay.put("type", "UNIONPAY");
         unionPay.put("payMap", payMap);
         return unionPay;
     }

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

@@ -1,5 +1,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.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
@@ -42,6 +44,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	
 	@Autowired
 	private ClassGroupStudentMapperDao classGroupStudentMapperDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Long, StudentAttendance> getDAO() {
@@ -51,6 +55,10 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void addStudentAttendances(List<StudentAttendance> studentAttendances) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(Objects.isNull(sysUser)){
+			throw new BizException("请登录");
+		}
 		if(CollectionUtils.isEmpty(studentAttendances)){
 			throw new BizException("无点名信息");
 		}
@@ -59,8 +67,10 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 		if(Objects.isNull(courseSchedule)){
 			throw new BizException("请指定课程");
 		}
+		studentAttendanceDao.deleteStudentAttendancesByCourse(courseScheduleId);
 		int classTimes=courseScheduleDao.countClassTimes(courseSchedule.getClassGroupId().longValue());
 		studentAttendances.forEach(studentAttendance -> {
+			studentAttendance.setTeacherId(sysUser.getId());
 			studentAttendance.setCurrentClassTimes(classTimes);
 			StudentAttendance studentAttendanceInfo = studentAttendanceDao.getStudentAttendanceInfo(studentAttendance);
 			if (studentAttendance.getStatus() != StudentAttendanceStatusEnum.DROP_OUT) {
@@ -68,7 +78,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 				if(StudentAttendanceStatusEnum.TRUANT.equals(studentAttendance.getStatus())
 						||StudentAttendanceStatusEnum.LEAVE.equals(studentAttendance.getStatus())){
 					StudentAttendance studentLatestAttendanceInfo = studentAttendanceDao.getStudentLatestAttendanceInfo(studentAttendanceInfo);
-					if(Objects.nonNull(studentAttendanceInfo)){
+					if(Objects.nonNull(studentLatestAttendanceInfo)){
 						if(StudentAttendanceStatusEnum.TRUANT.equals(studentLatestAttendanceInfo.getStatus())
 								||StudentAttendanceStatusEnum.LEAVE.equals(studentLatestAttendanceInfo.getStatus())){
 							studentFeeDao.updateStudentAbsenteeismTimes(studentAttendanceInfo.getUserId(),
@@ -93,10 +103,10 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			}
 		});
 		Map<StudentAttendanceStatusEnum, List<StudentAttendance>> studentAttendanceGroupByStatus = studentAttendances.stream().collect(Collectors.groupingBy(StudentAttendance::getStatus));
-		Integer studentNum=studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.NORMAL).size();
-		Integer leaveStudentNum=studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.LEAVE).size();
-		courseSchedule.setStudentNum(studentNum==null?0:studentNum);
-		courseSchedule.setLeaveStudentNum(leaveStudentNum==null?0:leaveStudentNum);
+		Integer studentNum=studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.NORMAL)==null?0:studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.NORMAL).size();
+		Integer leaveStudentNum=studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.LEAVE)==null?0:studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.LEAVE).size();
+		courseSchedule.setStudentNum(studentNum);
+		courseSchedule.setLeaveStudentNum(leaveStudentNum);
 		courseScheduleDao.update(courseSchedule);
 	}
 

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

@@ -379,7 +379,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             //学生报名表
             studentRegistrationDao.insert(studentRegistration);
             if (studentRegistration.getClassGroupId() != null) {
-                ClassGroup classGroup = classGroupDao.get(studentRegistration.getClassGroupId());
+                ClassGroup classGroup = classGroupDao.get(Integer.parseInt(studentRegistration.getClassGroupId()));
                 if (classGroup != null) {
                     if (classGroup.getMusicGroupId().equals(studentRegistration.getMusicGroupId())) {
                         throw new Exception("班级录入错误");
@@ -393,7 +393,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     throw new Exception("班级不存在");
                 }
                 //新增班级学生关系
-                classGroupStudentMapperDao.insert(new ClassGroupStudentMapper(studentRegistration.getClassGroupId(), userId));
+                classGroupStudentMapperDao.insert(new ClassGroupStudentMapper(Integer.parseInt(studentRegistration.getClassGroupId()), userId));
                 //乐团学生费用表
                 MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
                 //获取当前月

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

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -27,6 +28,10 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 
 	@Override
 	public long insert(VipGroupDefaultClassesCycle bean) {
+		if(Objects.isNull(bean.getOrganId())){
+			throw new BizException("请指定部门");
+		}
+
 		if(vipGroupDefaultClassesCycleDao.countAll()<=0){
 			bean.setMinClassTimes(0);
 			return super.insert(bean);
@@ -50,7 +55,10 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 
 	@Override
 	public int update(VipGroupDefaultClassesCycle bean) {
+		VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.get(bean.getId());
 		vipGroupDefaultClassesCycleDao.delete(bean.getId());
+		bean.setId(null);
+		bean.setOrganId(vipGroupDefaultClassesCycle.getOrganId());
 		return (int) insert(bean);
 	}
 
@@ -73,6 +81,7 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 			}else{
 				vipGroupDefaultClassesCycles.get(i).setMinClassTimes(vipGroupDefaultClassesCycles.get(i-1).getMaxClassTimes()+1);
 			}
+			vipGroupDefaultClassesCycles.get(i).setId(null);
 		}
 		return vipGroupDefaultClassesCycles;
 	}

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

@@ -237,7 +237,24 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			params.put("offset", pageInfo.getOffset());
 			dataList = vipGroupDao.findAllByOrgan(params);
 			List<Long> vipGroupIds = dataList.stream().map(vipGroup -> vipGroup.getId()).collect(Collectors.toList());
+			List<Map<Long, Integer>> vipGroupOverCourses = vipGroupDao.countVipGroupOverCourse(vipGroupIds);
+			Map<Long,Integer> vipGroupOverCourseMaps = MapUtil.convertMybatisMap(vipGroupOverCourses);
+			dataList.forEach(vipGroup -> {
+				Integer overCourses = vipGroupOverCourseMaps.get(vipGroup.getId());
+				if(Objects.isNull(overCourses)){
+					overCourses=0;
+				}
+				Integer totalClassTimes=vipGroup.getTotalClassTimes();
+				if(Objects.isNull(totalClassTimes)){
+					vipGroup.setMonthConsumeRate(0.0);
+				}else{
+					BigDecimal overCoursesOfMonth=new BigDecimal(overCourses),allClassTimes=new BigDecimal(totalClassTimes);
 
+					Double monthConsumeRate=overCoursesOfMonth.divide(allClassTimes,2,BigDecimal.ROUND_HALF_UP).doubleValue();
+					vipGroup.setMonthConsumeRate(monthConsumeRate);
+				}
+
+			});
 		}
 		if (count == 0) {
 			dataList = new ArrayList<>();
@@ -339,6 +356,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("请指定vip课程");
 		}
         StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(vipGroupId);
+		if(Objects.isNull(vipGroupDetail)){
+			throw new BizException("未找到指定课程");
+		}
+
         vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
         return vipGroupDetail;
 	}
@@ -494,7 +515,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	public void updateVipGroupStudentNumAndStatus(Long vipGroupId, Integer num) {
-		VipGroup vipGroup = vipGroupDao.get(vipGroupId);
+		VipGroup vipGroup = vipGroupDao.getLockVipGroup(vipGroupId);
 		if(Objects.isNull(vipGroup)){
 			throw new BizException("指定的vip课程不存在");
 		}
@@ -515,7 +536,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	public Map buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams) throws Exception {
 		SysUser user = sysUserFeignService.queryUserInfo();
 
-		StudentPaymentOrder byStudentVipGroup = studentPaymentOrderDao.findByStudentVipGroup(vipGroupBuyParams.getVipGroupId(), user.getId().longValue());
+		StudentPaymentOrder byStudentVipGroup = studentPaymentOrderDao.findByStudentVipGroup(vipGroupBuyParams.getVipGroupId(), user.getId());
 
 		if(Objects.nonNull(byStudentVipGroup)){
 			throw new BizException("订单已存在!");
@@ -574,7 +595,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		/*
 		根据回调信息调整订单状态及vip课程状态等相关信息
 		 */
-		Long vipGroupId=1L,userId=1L;
+		Long vipGroupId=1L;
+		Integer userId = 1;
+		boolean isOk=true;
+
+		//将学生加入到班级，更新班级报名状态及人数信息
+		if(!isOk){
+			updateVipGroupStudentNumAndStatus(vipGroupId,-1);
+		}
 
 		VipGroup vipGroup = vipGroupDao.get(vipGroupId);
 
@@ -588,25 +616,22 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
 		studentPaymentOrderDao.update(studentPaymentOrder);
 
-		//将学生加入到班级，更新班级报名状态及人数信息
-		ClassGroup classGroup = classGroupDao.get(vipGroupClassGroupMapper.getClassGroupId());
-		int classStudents = classGroupDao.countClassStudent(vipGroupClassGroupMapper.getClassGroupId().longValue());
-		if(classGroup.getExpectStudentNum()==classStudents){
-			vipGroup.setStatus(VipGroupStatusEnum.FINISH);
-			vipGroupDao.update(vipGroup);
-		}
-		classGroup.setStudentNum(classGroup.getStudentNum()+1);
-		classGroupDao.update(classGroup);
+		ClassGroupStudentMapper classGroupStudentMapper=new ClassGroupStudentMapper(vipGroupClassGroupMapper.getClassGroupId(),userId.intValue());
+		classGroupStudentMapperDao.insert(classGroupStudentMapper);
 
+		//更新所属分部列表
+		List<Integer> organIds = classGroupDao.findStudentOrganIdsByClassGroup(vipGroupClassGroupMapper.getClassGroupId().longValue());
+		organIds.add(vipGroup.getOrganId());
+		HashSet<Integer> hashSet = new HashSet<>(organIds);
+		String organIdsString = StringUtils.join(hashSet, ",");
+		vipGroup.setOrganIdList(organIdsString);
+		vipGroupDao.update(vipGroup);
 	}
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public void applyRefund(Long vipGroupId,Long studentId) {
-		SysUser sysUser=sysUserFeignService.queryUserInfo();
-    	if(null==studentId){
-    		studentId=sysUser.getId().longValue();
-		}
+	public void applyRefund(Long vipGroupId,Integer studentId) {
+
 		StudentApplyRefunds studentApplyRefunds=new StudentApplyRefunds();
 		StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupId,studentId);
 		if(null==studentPaymentOrder){
@@ -736,7 +761,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void stopGroup(Long vipGroupId) {
+	public void stopGroup(Long vipGroupId,String stopReason) {
     	if(Objects.isNull(vipGroupId)){
     		throw new BizException("请指定vip课");
 		}
@@ -752,14 +777,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     		vipGroupDao.update(vipGroup);
     		return;
 		}
-		List<Map<Long, BigDecimal>> maps = vipGroupDao.countSurplusCourseFee(vipGroupId);
+		List<Map<Integer, BigDecimal>> maps = vipGroupDao.countSurplusCourseFee(vipGroupId);
     	if(CollectionUtils.isEmpty(maps)||(maps.size()==1&&Objects.isNull(maps.get(0)))){
 			vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
 			vipGroupDao.update(vipGroup);
 			return;
 		}
-		Map<Long, BigDecimal> studentSurplusClassFees = MapUtil.convertMybatisMap(maps);
-    	for(Long userId:studentSurplusClassFees.keySet()){
+		Map<Integer, BigDecimal> studentSurplusClassFees = MapUtil.convertMybatisMap(maps);
+    	for(Integer userId:studentSurplusClassFees.keySet()){
 			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupId,userId);
 			if(null==studentPaymentOrder){
 				throw new BizException("未找到相关订单信息！");
@@ -776,6 +801,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			sysUserCashAccountDetailDao.insert(sysUserCashAccountDetail);
 		}
 		vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
+    	vipGroup.setStopReason(stopReason);
 		vipGroupDao.update(vipGroup);
 	}
 

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

@@ -490,8 +490,8 @@
             IF(vg.offline_classes_num_ IS NULL,0,vg.offline_classes_num_) offline_classes_num_,
             cg.total_class_times_,
             COUNT(vg.id_) surplus_class_times_,
-            mg.id_ music_group_id_,
-            mg.name_ music_group_name_,
+            vg.id_ music_group_id_,
+	        vg.name_ music_group_name_,
             s.id_ school_id_,
             s.name_ school_name_
         FROM
@@ -516,6 +516,14 @@
 		LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
     </select>
+    <select id="findStudentOrganIdsByClassGroup" resultType="int">
+        SELECT
+            DISTINCT su.organ_id_
+        FROM
+            class_group_student_mapper cgsm
+            LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
+            WHERE cgsm.class_group_id_=#{classGroupId}
+    </select>
 
     <select id="queryNamesByClassId" resultType="java.util.Map">
         SELECT cgr.class_group_id_ 'key',GROUP_CONCAT(cg.name_) 'value'

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

@@ -77,7 +77,7 @@
     </insert>
     
     <select id="query" resultMap="ClassGroupStudentMapper" parameterType="map">
-		SELECT * FROM class_group_student_mapper where class_group_id_ = #{classGroupId} and user_id_ = #{userId}
+		SELECT * FROM class_group_student_mapper where class_group_id_ = #{classGroupId} and user_id_ = #{userId} AND status_ IN ('NORMAL','LEAVE')
 	</select>
     <select id="findStudentNumByClassGroupId" resultType="string">
         SELECT
@@ -124,7 +124,7 @@
             su.id_ student_id_,
             su.username_,
             su.avatar_,
-            sa.status_
+            IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_

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

@@ -156,13 +156,15 @@
 		<result property="musicGroupId" column="music_group_id_"/>
 		<result property="musicGroupName" column="music_group_name_"/>
 		<result property="createTime" column="create_time_"/>
+		<result property="day" column="day_"/>
 	</resultMap>
 
-	<select id="findByClassGroupAndTeacher">
+	<select id="findByClassGroupAndTeacher" resultMap="teacherHomeworkListDto">
 		SELECT
 			ch.id_ course_homework_id_,
 			ch.content_,
 			ch.create_time_,
+			DATE_FORMAT(ch.create_time_,'%Y-%m-%d') 'day_',
 			ch.expect_num_,
 			ch.completed_num_,
 			cs.name_ course_schedule_name_,
@@ -175,7 +177,14 @@
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
 			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-			WHERE csts.user_id_=#{userId} AND ch.class_group_id_=#{classGroupId}
+			WHERE csts.user_id_=#{userId}
+			<if test="classGroupId!=null">
+				AND ch.class_group_id_=#{classGroupId}
+			</if>
+			<if test="createTime!=null">
+				AND DATE_FORMAT(ch.create_time_,'%Y%m')=DATE_FORMAT(#{createTime},'%Y%m')
+			</if>
+		  ORDER BY ch.id_ DESC
 	</select>
 	<select id="countByClassGroupAndTeacher" resultType="int">
 		SELECT
@@ -183,7 +192,10 @@
 		FROM
 			course_homework ch
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
-			WHERE csts.user_id_=#{userId} AND ch.class_group_id_=#{classGroupId}
+			WHERE csts.user_id_=#{userId}
+			<if test="classGroupId!=null">
+				AND ch.class_group_id_=#{classGroupId}
+			</if>
 	</select>
 	<select id="findByTeacherAndCourseHomewok" resultMap="CourseHomework">
 		SELECT

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

@@ -128,7 +128,7 @@
                 leave_student_num_ = #{leaveStudentNum},
             </if>
             <if test="schoolId != null">
-                school_id_ = #{schoolId},
+                schoole_id_ = #{schoolId},
             </if>
         </set>
         WHERE id_ = #{id}
@@ -354,6 +354,7 @@
         su.username_ teacher_name_,
         cs.type_,
         cs.id_,
+        cs.class_group_id_,
         cs.class_date_,
         CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
         CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,

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

@@ -161,7 +161,7 @@
     <update id="batchUpdateWages" parameterType="map">
 		UPDATE course_schedule_teacher_salary set
 			subsidy_ = #{subsidy},
-			expect_salary_ = #{expectSalary},
+			expect_salary_ = #{salary},
 			teacher_role_ = #{teacherRole},
 			update_time_ = now()
 		WHERE user_id_ = #{userId} and class_group_id_ = #{classGroupId}

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

@@ -151,22 +151,18 @@
 
     <select id="getStudentAttendanceInfo" parameterType="com.ym.mec.biz.dal.entity.StudentAttendance" resultMap="StudentAttendance">
         SELECT
-            cgsm.class_group_id_,
-            su.id_ user_id_,
+            cs.class_group_id_,
+            #{userId} user_id_,
             mg.id_ music_group_id_,
-            s.id_ subject_id_,
             #{teacherId} teacher_id_,
             #{status} status_,
             #{remark} remark_,
             #{courseScheduleId} course_schedule_id_
         FROM
-            sys_user su
-            LEFT JOIN class_group_student_mapper cgsm ON cgsm.user_id_ = su.id_
-            LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
+            course_schedule cs
+            LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
             LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        WHERE
-            su.id_=#{userId} AND cs.id_=#{courseScheduleId}
+        WHERE cs.id_=#{courseScheduleId}
     </select>
 
     <select id="getStudentLatestAttendanceInfo" resultType="com.ym.mec.biz.dal.entity.StudentAttendance" resultMap="StudentAttendance">

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

@@ -10,6 +10,7 @@
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId"/>
 		<result column="username_" property="userName"/>
+		<result column="avatar_" property="avatar"/>
 		<result column="course_homework_id_" property="courseHomeworkId" />
 		<result column="attachments_" property="attachments" />
 		<result column="score_" property="score" />
@@ -213,7 +214,8 @@
 	<select id="findByCourseSchedule" resultMap="StudentCourseHomework">
 		SELECT
 			sch.*,
-			su.username_
+			su.username_,
+			su.avatar_
 		FROM
 			student_course_homework sch
 			LEFT JOIN sys_user su ON sch.user_id_=su.id_

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

@@ -20,6 +20,7 @@
         <result property="userId" column="comment_user_id_"></result>
         <result property="userName" column="comment_user_name_"></result>
         <result property="avatar" column="avatar_"/>
+        <result property="isTeacher" column="is_teacher_"/>
         <result property="content" column="comment_content_"></result>
         <result property="createTime" column="comment_time"></result>
     </resultMap>
@@ -95,12 +96,14 @@
             schr.user_id_ comment_user_id_,
             suc.username_ comment_user_name_,
             suc.avatar_,
+            IF(suc.user_type_!='STUDENT',1,0) is_teacher_,
             schr.content_ comment_content_,
             schr.create_time_ comment_time
         FROM
         student_course_homework_reply schr
         LEFT JOIN sys_user suc ON schr.user_id_=suc.id_
         <include refid="queryCondition"/>
+        ORDER BY schr.id_ DESC
         <include refid="global.limit"/>
     </select>
 

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

@@ -28,8 +28,6 @@
         <result column="parents_company_" property="parentsCompany"/>
         <result column="payment_status_" property="paymentStatus"
                 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>
     
@@ -297,6 +295,6 @@
 
     <!-- 获取班级下的学生 -->
     <select id="findClassGroupStu" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE music_group_id_= #{musicGroupId} AND class_group_id_=#{classGroupId}
+        SELECT * FROM student_registration WHERE music_group_id_= #{musicGroupId} AND FIND_IN_SET(#{classGroupId},class_group_id_)
     </select>
 </mapper>

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

@@ -76,6 +76,6 @@
         FROM
             vip_group_class_group_mapper vgcgm
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
-            WHERE vgcgm.vip_group_id_=#{vipGroupId}
+            WHERE vgcgm.vip_group_id_=#{vipGroupId} FOR UPDATE
     </select>
 </mapper>

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

@@ -34,6 +34,7 @@
         <result column="vip_group_category_id_" property="vipGroupCategoryId"/>
         <result column="give_teach_mode_" property="giveTeachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="organ_id_" property="organId"/>
+        <result column="stop_reason_" property="stopReason"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.entity.School" id="School">
@@ -162,8 +163,8 @@
         </selectKey>
         -->
         INSERT INTO vip_group
-        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,name_,organ_id_list_,vip_group_activity_id_,status_,online_classes_unit_price_,offline_classes_unit_price_,total_price_,give_teach_mode_,vip_group_category_id_,organ_id_)
-        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId})
+        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,name_,organ_id_list_,vip_group_activity_id_,status_,online_classes_unit_price_,offline_classes_unit_price_,total_price_,give_teach_mode_,vip_group_category_id_,organ_id_,stop_reason_)
+        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId},#{stopReason})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -227,6 +228,9 @@
             <if test="organId!=null">
                 organ_id_=#{organId}
             </if>
+            <if test="stopReason!=null">
+                stop_reason_=#{stopReason}
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -250,6 +254,7 @@
     <sql id="studentVipGroupQueryCondition">
         <where>
             vg.status_!=3
+            AND vg.audit_status_='PASS'
             <if test="subjectId!=null">
                AND FIND_IN_SET(#{subjectId},cg.subject_id_list_)
             </if>
@@ -561,9 +566,7 @@
     </select>
     <select id="countTeacherVipGroups" resultType="int">
         SELECT COUNT(vg.id_) FROM vip_group vg
-        LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_ = vgcgm.vip_group_id_
-        LEFT JOIN course_schedule cs ON cs.class_group_id_ = vgcgm.class_group_id_
-        WHERE cs.actual_teacher_id_ = #{teacherId} AND cs.type_ = 'VIP' AND status_!=3 GROUP BY vg.id_
+        WHERE vg.user_id_ = #{teacherId} AND vg.status_!=3
     </select>
 
     <select id="countTeacherVipClass" resultType="java.lang.Integer">
@@ -607,4 +610,20 @@
     <select id="querySchoolByUserId" resultMap="School">
         SELECT * from school where user_id_ = #{userId} or user_id_ is null
     </select>
+
+    <select id="countVipGroupOverCourse" resultType="java.util.Map">
+        SELECT
+            vgcgm.vip_group_id_,
+            COUNT(cs.Id_)
+        FROM
+            vip_group_class_group_mapper vgcgm
+            LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+            WHERE cs.status_='OVER'
+            AND DATE_FORMAT(cs.class_date_,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d')
+            AND vgcgm.vip_group_id_ IN
+            <foreach collection="list" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        GROUP BY vgcgm.vip_group_id_
+    </select>
 </mapper>

mec-eureka/src/main/resources/application.yml

@@ -11,10 +11,10 @@ eureka:
     fetchRegistry: false
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    ###因为自己是为注册中心，是否需要自己注册自己
+    ###是否向服务注册中心注册自己
     register-with-eureka: false
-    ###因为自己是为注册中心，是否需要检索服务
-    fetch-registry: false
+    ###是否需要检索服务
+    fetch-registry: true
     
 spring:
   application:

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -71,7 +71,7 @@ hystrix:
       execution: 
         isolation: 
           thread: 
-            timeoutInMilliseconds: 6000
+            timeoutInMilliseconds: 60000
             
             
 #spring boot admin 相关配置

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

@@ -1,15 +1,5 @@
 package com.ym.mec.student.controller;
 
-import java.math.BigDecimal;
-
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -21,6 +11,14 @@ 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.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+
 @RequestMapping("course")
 @Api(tags = "课程服务")
 @RestController
@@ -81,16 +79,4 @@ public class CourseController extends BaseController {
         studentPayLogQueryInfo.setUserId(sysUser.getId());
         return succeed(classGroupService.queryStudentPayLog(studentPayLogQueryInfo));
     }
-
-	@ApiOperation(value = "课酬调整")
-	@PostMapping("/updateTeacherCoursesSalary")
-    @PreAuthorize("@pcs.hasPermissions('course/updateTeacherCoursesSalary')")
-	public Object updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null || sysUser.getId() == null) {
-			return failed("获取用户失败");
-		}
-		musicGroupService.updateTeacherCoursesSalary(courseScheduleId, teacherId, salary, subsidy, scope);
-		return succeed();
-	}
 }

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

@@ -1,5 +1,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.biz.dal.dto.ConditionDto;
 import com.ym.mec.biz.dal.dto.QueryConditionDto;
 import com.ym.mec.biz.dal.dto.VipGroupBuyParamsDto;
@@ -7,9 +9,12 @@ import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -31,6 +36,8 @@ public class StudentVipGroupController extends BaseController {
     private VipGroupService vipGroupService;
     @Autowired
     private SubjectService subjectService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "获取vip课列表筛选条件")
     @GetMapping(value = "/findQueryCondition")
@@ -67,9 +74,13 @@ public class StudentVipGroupController extends BaseController {
 
     @ApiOperation(value = "vip课退课")
     @PostMapping("/applyRefund")
-    public Object applyRefund(Long vipGroupId){
-        vipGroupService.applyRefund(vipGroupId,null);
-        return succeed();
-    }
+	public Object applyRefund(Long vipGroupId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (null == sysUser) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		vipGroupService.applyRefund(vipGroupId, sysUser.getId());
+		return succeed();
+	}
 
 }

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

@@ -0,0 +1,142 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.SysMessage;
+import com.ym.mec.biz.dal.entity.SysMessageConfig.MessageType;
+import com.ym.mec.biz.dal.enums.MessageSendMode;
+import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
+import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
+import com.ym.mec.util.validator.CommonValidator;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+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.io.IOException;
+
+@RestController
+@Api(tags = "消息服务")
+@RequestMapping("sysMessage")
+public class SysMessageController extends BaseController {
+
+	@Autowired
+	private SysMessageService sysMessageService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("获取所有消息列表")
+	@GetMapping(value = "list")
+	public Object list(SysMessageQueryInfo queryInfo) throws IOException {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		queryInfo.setUserId(sysUser.getId());
+		queryInfo.setType(3);
+		PageInfo<SysMessage> pageInfo = sysMessageService.queryPage(queryInfo);
+		return succeed(pageInfo);
+	}
+
+	@ApiOperation("一键已读")
+	@PostMapping("batchSetRead")
+	public Object batchSetRead() {
+		int status = 1;
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		return sysMessageService.updateStatus(sysUser.getId(), status) > 0 ? succeed() : failed();
+	}
+
+	@ApiOperation("设置已读")
+	@PostMapping("setRead")
+	public Object setRead(Long id) {
+		int status = 1;
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		return sysMessageService.updateOneStatus(id, status) > 0 ? succeed() : failed();
+	}
+
+	@ApiOperation(value = "查询用户未读消息条数")
+	@GetMapping("/queryCountOfUnread")
+	public Object queryCountOfUnread() {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("请重新登录");
+		}
+		return succeed(sysMessageService.queryCountOfUnread(sysUser.getId()));
+	}
+
+	@ApiOperation(value = "发送短信验证码")
+	@PostMapping("/sendSmsCode")
+	public Object sendSmsCode(String sendCodeType, String mobileNo) {
+
+		SysUser sysUser;
+
+		if (StringUtils.isBlank(mobileNo)) {
+			sysUser = sysUserFeignService.queryUserInfo();
+		} else {
+			sysUser = sysUserFeignService.queryUserByMobile(mobileNo);
+		}
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		Integer userId = sysUser.getId();
+
+		mobileNo = sysUser.getPhone();
+
+		MessageType messageType = MessageType.getMessageType(sendCodeType);
+		if (messageType == null) {
+			throw new BizException("消息类型参数错误");
+		}
+		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
+			throw new BizException("请输入正确的手机号");
+		}
+		sysMessageService.sendSecurityCode(MessageSender.YIMEI, userId, MessageSendMode.SMS, messageType, mobileNo);
+		return succeed();
+	}
+
+	@ApiOperation(value = "发送短信验证码")
+	@PostMapping("/noAuth/sendSmsCode")
+	public Object noAuthSendSmsCode(String sendCodeType, String mobileNo) {
+		MessageType messageType = MessageType.getMessageType(sendCodeType);
+		if (messageType == null) {
+			throw new BizException("消息类型参数错误");
+		}
+		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
+			throw new BizException("请输入正确的手机号");
+		}
+//		sysMessageService.sendSecurityCode(MessageSender.YIMEI, userId, MessageSendMode.SMS, messageType, mobileNo);
+		return succeed();
+	}
+
+	@ApiOperation(value = "发送消息")
+	@PostMapping("/sendMessage")
+	public Object sendMessage(MessageSender messageSender, MessageSendMode sendMode, String content, String receiver, int readStatus, String url) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		Integer userId = sysUser.getId();
+
+		String mobileNo = sysUser.getPhone();
+		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
+			throw new BizException("请输入正确的手机号");
+		}
+		sysMessageService.sendMessage(messageSender, userId, sendMode, "", content, receiver, null, readStatus, url);
+		return succeed();
+	}
+}

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

@@ -31,7 +31,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
 
     @ApiOperation(value = "新增回复")
     @PostMapping("/add")
-    public Object add(StudentCourseHomeworkReply studentCourseHomeworkReply) {
+    public Object add(@RequestBody StudentCourseHomeworkReply studentCourseHomeworkReply) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -24,7 +24,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
-		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and().authorizeRequests().antMatchers("/v2/api-docs").permitAll().anyRequest().authenticated().and().httpBasic();
+		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and().authorizeRequests().antMatchers("/v2/api-docs","/classGroup/revisionClassGroup").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dto.ClassGroupAdjustDto;
 import com.ym.mec.biz.dal.dto.HighClassGroupDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
@@ -48,7 +49,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "新增提高班")
     @PostMapping("/addHighClass")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/addHighClass')")
+    //@PreAuthorize("@pcs.hasPermissions('classGroup/addHighClass')")
     @ApiParam(value = "乐团提高班json", required = true)
     public Object addHighClass(@RequestBody List<HighClassGroupDto> highClassGroupDtoList) throws Exception {
         if (highClassGroupDtoList.size() <= 0) {
@@ -93,7 +94,7 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/findClassGroupAboutMix")
     @PreAuthorize("@pcs.hasPermissions('classGroup/findClassGroupAboutMix')")
     public HttpResponseResult findClassGroupAboutMix(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId,
-                                         @ApiParam(value = "班级编号", required = false) Integer mixClassGroupId) {
+                                                     @ApiParam(value = "班级编号", required = false) Integer mixClassGroupId) {
         return succeed(classGroupService.findClassGroup(musicGroupId, mixClassGroupId));
     }
 
@@ -140,7 +141,7 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/findMusicGroupClassTeacher")
     @PreAuthorize("@pcs.hasPermissions('classGroup/findMusicGroupClassTeacher')")
     public HttpResponseResult findMusicGroupClassTeacher(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId) {
-        return succeed(classGroupService.getClassGroupAndTeachers(musicGroupId,"NORMAL,MIX"));
+        return succeed(classGroupService.getClassGroupAndTeachers(musicGroupId, "NORMAL,MIX"));
     }
 
     @ApiOperation(value = "获取乐团班级老师课酬")
@@ -182,23 +183,21 @@ public class ClassGroupController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('classGroup/addMusicGroupTeam')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "teacherId", value = "老师编号", required = true, dataType = "Integer")})
-    public Object addMusicGroupTeam(Integer teacherId,String musicGroupId,Integer improventClassesNum) throws Exception {
-        if(teacherId == null || StringUtils.isEmpty(musicGroupId) || improventClassesNum == null){
+    public Object addMusicGroupTeam(Integer teacherId, String musicGroupId, Integer improventClassesNum) throws Exception {
+        if (teacherId == null || StringUtils.isEmpty(musicGroupId) || improventClassesNum == null) {
             return failed("参数校验错误");
         }
-        classGroupService.addMusicGroupTeam(teacherId,musicGroupId,improventClassesNum);
+        classGroupService.addMusicGroupTeam(teacherId, musicGroupId, improventClassesNum);
         return succeed();
     }
 
 
-    @ApiOperation(value = "合并班级")
-    @PostMapping("/mergeClassGroup")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/mergeClassGroup')")
+    @ApiOperation(value = "调整班级")
+    @PostMapping("/revisionClassGroup")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/revisionClassGroup')")
     @ApiImplicitParams({@ApiImplicitParam(name = "classGroupIds", value = "班级编号,号分割", required = true, dataType = "String")})
-    public HttpResponseResult mergeClassGroup(String classGroupIds) throws Exception {
-        //软删除班级
-
-        return succeed();
+    public HttpResponseResult revisionClassGroup(@RequestBody ClassGroupAdjustDto classGroupAdjustDto) throws Exception {
+        return succeed(classGroupService.classGroupAdjust(classGroupAdjustDto));
     }
 
 }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -22,13 +23,15 @@ 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.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.MusicGroupService;
@@ -51,6 +54,9 @@ public class CourseScheduleController extends BaseController {
     private StudentAttendanceService studentAttendanceService;
     @Autowired
     private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
     
     @Autowired
     private MusicGroupService musicGroupService;
@@ -141,10 +147,10 @@ public class CourseScheduleController extends BaseController {
     @ApiOperation(value = "课程投诉审核")
     @GetMapping(value = "/courseScheduleCommplaintAudit")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseScheduleCommplaintAudit')")
-    public Object courseScheduleCommplaintAudit(CourseScheduleComplaints courseScheduleComplaints){
-        scheduleService.courseScheduleCommplaintAudit(courseScheduleComplaints);
-        return succeed();
-    }
+	public Object courseScheduleCommplaintAudit(Long id, Double teacherLiabilityRatio, Double studentLiabilityRatio, AuditStatusEnum status) {
+		scheduleService.courseScheduleCommplaintAudit(id, teacherLiabilityRatio, studentLiabilityRatio, status);
+		return succeed();
+	}
 
     @ApiOperation(value = "检测乐团下所有的班级是否都已排课")
     @PostMapping(value = "/checkMusicGroupClassCourse")
@@ -154,4 +160,16 @@ public class CourseScheduleController extends BaseController {
         return succeed();
     }
 
+	@ApiOperation(value = "课酬调整")
+	@PostMapping("/updateTeacherCoursesSalary")
+    @PreAuthorize("@pcs.hasPermissions('course/updateTeacherCoursesSalary')")
+	public Object updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null || sysUser.getId() == null) {
+			return failed("获取用户失败");
+		}
+		musicGroupService.updateTeacherCoursesSalary(courseScheduleId, teacherId, salary, subsidy, scope);
+		return succeed();
+	}
+
 }

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

@@ -17,6 +17,7 @@ import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -85,7 +86,7 @@ public class VipGroupManageController extends BaseController {
     @ApiOperation(value = "退课申请")
     @PostMapping("/applyRefundForStudent")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/applyRefundForStudent')")
-    public Object applyRefundForStudent(Long vipGroupId,Long studentId){
+    public Object applyRefundForStudent(Long vipGroupId,Integer studentId){
         vipGroupService.applyRefund(vipGroupId,studentId);
         return succeed();
     }
@@ -123,11 +124,11 @@ public class VipGroupManageController extends BaseController {
     @ApiOperation(value = "停止vip课")
     @PostMapping("/stopVipGroup")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/stopVipGroup')")
-    public Object stopVipGroup(Long vipGroupId){
-        if(Objects.isNull(vipGroupId)){
-            return failed(HttpStatus.FORBIDDEN,"请指定vip课");
+    public Object stopVipGroup(Long vipGroupId,String stopReason){
+        if(Objects.isNull(vipGroupId)|| StringUtils.isBlank(stopReason)){
+            return failed(HttpStatus.FORBIDDEN,"请指定vip课并指定取消原因");
         }
-        vipGroupService.stopGroup(vipGroupId);
+        vipGroupService.stopGroup(vipGroupId,stopReason);
         return succeed();
     }
 

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/TaskController.java

@@ -46,7 +46,7 @@ public class TaskController extends BaseController {
 		SysUser user = SysUserFeignService.queryUserInfo();
 
 		List<String> list = new ArrayList<String>();
-		list.add(user.getUsername());
+		list.add(user.getId() + "");
 
 		String[] assignees = new String[list.size()];
 		list.toArray(assignees);
@@ -61,7 +61,7 @@ public class TaskController extends BaseController {
 		List<HistoryOrder> ccWorks = snakerEngine.query().getCCWorks(ccorderPage, new QueryFilter().setOperators(assignees).setState(1));
 
 		ModelMap model = new ModelMap();
-		
+
 		model.addAttribute("majorWorks", majorWorks);
 		model.addAttribute("majorTotal", majorPage.getTotalCount());
 		model.addAttribute("aidantWorks", aidantWorks);
@@ -80,7 +80,7 @@ public class TaskController extends BaseController {
 	public Object queryWaitList(Page<WorkItem> page) {
 		SysUser user = SysUserFeignService.queryUserInfo();
 
-		snakerEngine.query().getWorkItems(page, new QueryFilter().setOperator(user.getUsername()));
+		snakerEngine.query().getWorkItems(page, new QueryFilter().setOperator(user.getId() + ""));
 		return succeed(page);
 	}
 
@@ -128,7 +128,7 @@ public class TaskController extends BaseController {
 		SysUser user = SysUserFeignService.queryUserInfo();
 
 		List<String> list = new ArrayList<String>();
-		list.add(user.getUsername());
+		list.add(user.getId() + "");
 
 		String[] assignees = new String[list.size()];
 		list.toArray(assignees);
@@ -146,7 +146,7 @@ public class TaskController extends BaseController {
 		SysUser user = SysUserFeignService.queryUserInfo();
 
 		List<String> list = new ArrayList<String>();
-		list.add(user.getUsername());
+		list.add(user.getId() + "");
 
 		String[] assignees = new String[list.size()];
 		list.toArray(assignees);
@@ -165,7 +165,7 @@ public class TaskController extends BaseController {
 
 		SysUser user = SysUserFeignService.queryUserInfo();
 
-		snakerEngine.executeAndJumpTask(taskId, user.getUsername(), null, null);
+		snakerEngine.executeAndJumpTask(taskId, user.getId() + "", null, null);
 		return succeed();
 	}
 
@@ -177,7 +177,7 @@ public class TaskController extends BaseController {
 	@GetMapping(value = "history")
 	public Object historyTaskList(Page<WorkItem> page) {
 		SysUser user = SysUserFeignService.queryUserInfo();
-		snakerEngine.query().getHistoryWorkItems(page, new QueryFilter().setOperator(user.getUsername()));
+		snakerEngine.query().getHistoryWorkItems(page, new QueryFilter().setOperator(user.getId() + ""));
 		return succeed(page);
 	}
 
@@ -189,7 +189,7 @@ public class TaskController extends BaseController {
 	@PostMapping(value = "undo")
 	public Object historyTaskUndo(String orderId) {
 		SysUser user = SysUserFeignService.queryUserInfo();
-		snakerEngine.order().withdraw(orderId, user.getUsername());
+		snakerEngine.order().withdraw(orderId, user.getId() + "");
 		return succeed();
 	}
 }

mec-workflow/src/main/java/com/ym/mec/workfow/controller/web/LeaveController.java

@@ -37,11 +37,12 @@ public class LeaveController extends BaseController {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("applyer", user.getId());
 		params.put("days", days);
-		params.put("deptManager", deptManager);
+		//params.put("deptManager", deptManager);
 		params.put("boss", boss);
+		params.put("operator", user.getUsername());
 
 		// 开启实例
-		Order order = snakerEngine.startInstanceById(processId, user.getUsername(), params);
+		Order order = snakerEngine.startInstanceById(processId, user.getId()+"", params);
 
 		// 获取当前任务
 		List<Task> tasks = snakerEngine.query().getActiveTasks(new QueryFilter().setOrderId(order.getId()).setOperator(user.getId() + ""));
@@ -62,6 +63,7 @@ public class LeaveController extends BaseController {
 
 		params.put("status", isAgree);
 		params.put("remark", remark);
+		params.put("operator", user.getUsername());
 
 		List<Task> tasks = null;
 

mec-workflow/src/main/java/com/ym/mec/workfow/service/MecAccessStrategy.java

@@ -0,0 +1,25 @@
+package com.ym.mec.workfow.service;
+
+import java.util.List;
+
+import org.snaker.engine.impl.GeneralAccessStrategy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+
+@Service
+public class MecAccessStrategy extends GeneralAccessStrategy {
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@Override
+	public List<String> ensureGroup(String operator) {
+
+		List<String> roleCodeList = sysUserFeignService.queryRoleCodeListByUserId(Integer.parseInt(operator));
+
+		return roleCodeList;
+	}
+
+}

mec-workflow/src/main/resources/flows/leave.snaker

@@ -7,7 +7,7 @@
 <task assignee="applyer" displayName="请假申请" layout="117,122,-1,-1" name="apply" performType="ANY">
 <transition g="" name="transition2" offset="0,0" to="approveDept"/>
 </task>
-<task assignee="deptManager" displayName="部门经理审批" layout="272,122,-1,-1" name="approveDept" performType="ANY">
+<task assignee="ROLE_ADMIN" displayName="部门经理审批" layout="272,122,-1,-1" name="approveDept" performType="ANY">
 <transition g="" name="transition3" offset="0,0" to="decision1"/>
 </task>
 <decision displayName="decision1" layout="426,124,-1,-1" name="decision1">

workflowy/src/main/java/org/snaker/engine/access/QueryFilter.java

@@ -15,9 +15,14 @@
 package org.snaker.engine.access;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
+import org.snaker.engine.Completion;
+import org.snaker.engine.core.ServiceContext;
 import org.snaker.engine.helper.AssertHelper;
+import org.snaker.engine.impl.GeneralAccessStrategy;
 
 /**
  * 通用查询过滤器
@@ -31,7 +36,9 @@ public class QueryFilter implements Serializable {
 	private static final long serialVersionUID = -8155136377911571881L;
     public static final String ASC = "asc";
     public static final String DESC = "desc";
-
+    
+    private GeneralAccessStrategy taskAccessStrategy;
+    
     //排序字段
     private String orderBy;
     //排序类型ASC/DESC
@@ -155,8 +162,16 @@ public class QueryFilter implements Serializable {
 	}
 	public QueryFilter setOperator(String operator) {
 		AssertHelper.notEmpty(operator);
-		this.operators = new String[1];
-		this.operators[0] = operator;
+		
+		List<String> groups = getTaskAccessStrategy().ensureGroup(operator);
+		if(groups == null){
+			groups = new ArrayList<String>();
+		}
+		if(!groups.contains(operator)){
+			groups.add(operator);
+		}
+		
+		this.operators = groups.toArray(new String[groups.size()]);
 		return this;
 	}
 	public String[] getNames() {
@@ -291,4 +306,19 @@ public class QueryFilter implements Serializable {
     public boolean isOrderBySetted() {
         return (StringUtils.isNotBlank(orderBy) && StringUtils.isNotBlank(order));
     }
+	public GeneralAccessStrategy getTaskAccessStrategy() {
+		if(taskAccessStrategy != null) {
+            return taskAccessStrategy;
+        }
+
+		taskAccessStrategy = ServiceContext.find(GeneralAccessStrategy.class);
+        if(taskAccessStrategy == null) {
+            ServiceContext.put(Completion.class.getName(), GeneralAccessStrategy.class);
+            taskAccessStrategy = ServiceContext.find(GeneralAccessStrategy.class);
+        }
+		return taskAccessStrategy;
+	}
+	public void setTaskAccessStrategy(GeneralAccessStrategy taskAccessStrategy) {
+		this.taskAccessStrategy = taskAccessStrategy;
+	}
 }

workflowy/src/main/java/org/snaker/engine/impl/GeneralAccessStrategy.java

@@ -32,7 +32,7 @@ public class GeneralAccessStrategy implements TaskAccessStrategy {
 	 * @param operator 操作人id
 	 * @return List<String> 确定的组集合[如操作人属于多个部门、拥有多个角色]
 	 */
-	protected List<String> ensureGroup(String operator) {
+	public List<String> ensureGroup(String operator) {
 		return null;
 	}
 	

workflowy/src/test/java/test/task/group/CustomAccessStrategy.java

@@ -25,7 +25,7 @@ import org.snaker.engine.impl.GeneralAccessStrategy;
  */
 public class CustomAccessStrategy extends GeneralAccessStrategy {
 	@Override
-	protected List<String> ensureGroup(String operator) {
+	public List<String> ensureGroup(String operator) {
 		List<String> groups = new ArrayList<String>();
 		if(operator.equals("test")) {
 			groups.add("test");