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

# Conflicts:
#	mec-client-api/src/main/java/com/ym/im/ImFeignService.java

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

@@ -93,7 +93,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "authCode", value = "验证码", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "newPassword", value = "新密码", required = true, dataType = "String")})
-	public Object updatePassword(String mobile,String authCode,String password,String newPassword) {
+	public Object updatePassword(String mobile,String authCode,String newPassword) {
 		if(StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(newPassword)){
 			return failed("参数校验异常");
 		}
@@ -102,7 +102,7 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		if(smsCodeService.verifyValidCode(mobile, authCode)){
-			sysUserService.updatePassword(mobile,newPassword);
+			sysUserService.updatePassword(mobile,new BCryptPasswordEncoder().encode(newPassword));
 			return succeed();
 		}else {
 			return failed("验证码错误");

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
+import com.ym.mec.biz.dal.dto.CourseListDto;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
@@ -91,4 +92,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") int musicGroupId);
+
+    /**
+     * 获取学生所购买课程列表
+     * @param userId
+     * @return
+     */
+    List<CourseListDto> queryCoursePage(int userId);
 }

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

@@ -26,5 +26,5 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param ClassGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List<ClassGroup> ClassGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List ClassGroupList);
 }

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

@@ -3,7 +3,16 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
-public interface ClassGroupTeacherSalaryDao extends BaseDAO<Integer, ClassGroupTeacherSalary> {
+import java.util.List;
 
+public interface ClassGroupTeacherSalaryDao extends BaseDAO<Long, ClassGroupTeacherSalary> {
+
+    /**
+     * 获取乐团老师课酬配置
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeacherSalary> findByMusicGroupId(@Param("musicGroupId") int musicGroupId);
 }

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

@@ -14,6 +14,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     /**
      * 根据教师ID获取当前课程信息
+     *
      * @param teacherID
      * @return
      */
@@ -87,4 +88,12 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * 根据id批量获取课程
      */
     List<CourseSchedule> findCourseSchedulesByIds(@Param("ids") Long[] ids);
+
+    /**
+     * 获取班级的课程计划
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<CourseSchedule> findClassGroupCourseSchedules(@Param("classGroupList") List classGroupList);
 }

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

@@ -2,8 +2,19 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 public interface DemoGroupCoursesPlanDao extends BaseDAO<Long, DemoGroupCoursesPlan> {
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/25
+     * 根据上课时间批量记录临时上课计划
+     */
+    int batchInsertByDates(@Param("dates") List<Date> dates,
+                           @Param("demoGroupId") Long demoGroupId);
 	
 }

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

@@ -29,7 +29,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param userId
      * @return
      */
-    int countUserMusicGroups(Integer userId);
+    Integer countUserMusicGroups(Integer userId);
 
     /**
      * 根据课程类型获取剩余课时
@@ -37,5 +37,5 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param type
      * @return
      */
-    int countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
+    Integer countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
 }

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

@@ -18,4 +18,11 @@ public interface SysAreaDao extends BaseDAO<Integer, SysArea> {
      * @return
      */
     List<SysArea> findRootList(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
+
+    /**
+     * 根据子级区域获取父级节点
+     * @param id
+     * @return
+     */
+    SysArea getParentArea(Integer id);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 
 import java.util.List;
 
@@ -13,6 +14,9 @@ public class ClassGroupTeachers extends ClassGroup {
 	/** 班级老师 **/
 	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
 
+	/** 班级老师课酬 */
+	private List<ClassGroupTeacherSalary> classGroupTeacherSalaryList;
+
 
 	public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
 		return classGroupTeacherMapperList;
@@ -21,4 +25,12 @@ public class ClassGroupTeachers extends ClassGroup {
 	public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
 		this.classGroupTeacherMapperList = classGroupTeacherMapperList;
 	}
+
+	public List<ClassGroupTeacherSalary> getClassGroupTeacherSalaryList() {
+		return classGroupTeacherSalaryList;
+	}
+
+	public void setClassGroupTeacherSalaryList(List<ClassGroupTeacherSalary> classGroupTeacherSalaryList) {
+		this.classGroupTeacherSalaryList = classGroupTeacherSalaryList;
+	}
 }

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

@@ -0,0 +1,37 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class ConditionDto {
+
+    @ApiModelProperty(value = "条件ID",required = false)
+    private Long id;
+
+    @ApiModelProperty(value = "条件名称",required = false)
+    private String name;
+
+    public ConditionDto(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class CourseListDto {
+
+    @ApiModelProperty(value = "乐团、vip课编号",required = true)
+    private String musicGroupId;
+
+    @ApiModelProperty(value = "学生姓名",required = true)
+    private String studentNames;
+
+    @ApiModelProperty(value = "乐团、vip课名称",required = true)
+    private String musicGroupName;
+
+    @ApiModelProperty(value = "授课地址",required = true)
+    private String address;
+
+    @ApiModelProperty(value = "总课次",required = true)
+    private Integer totalClassTimes;
+
+    @ApiModelProperty(value = "当前课次",required = true)
+    private Integer currentClassTimes;
+
+    @ApiModelProperty(value = "教师姓名",required = true)
+    private String teacherName;
+
+    @ApiModelProperty(value = "上课模式",required = true)
+    private String teachMode;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public String getStudentNames() {
+        return studentNames;
+    }
+
+    public void setStudentNames(String studentNames) {
+        this.studentNames = studentNames;
+    }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
+    public Integer getCurrentClassTimes() {
+        return currentClassTimes;
+    }
+
+    public void setCurrentClassTimes(Integer currentClassTimes) {
+        this.currentClassTimes = currentClassTimes;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(String teachMode) {
+        this.teachMode = teachMode;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.DemoGroup;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class DemoGroupApplyDto extends DemoGroup {
+
+    private List<Date> courseDates;
+
+    public List<Date> getCourseDates() {
+        return courseDates;
+    }
+
+    public void setCourseDates(List<Date> courseDates) {
+        this.courseDates = courseDates;
+    }
+}

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

@@ -1,76 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ClassGroupTeacherSalary {
-    private Long id;
-
-    private Integer musicGroupId;
-
-    private Integer classGroupId;
-
+public class ClassGroupTeacherSalary extends ClassGroupTeacherMapper {
     /**
-    * 老师角色（主教、助教）
-    */
-    private String teacherRole;
-
-    private Integer userId;
-
-    /**
-    * 课时长
-    */
+     * 课时长
+     */
     private Integer duration;
 
-    /**
-    * 薪酬
-    */
-    private BigDecimal salary;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(Integer musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getTeacherRole() {
-        return teacherRole;
-    }
-
-    public void setTeacherRole(String teacherRole) {
-        this.teacherRole = teacherRole;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
     public Integer getDuration() {
         return duration;
     }
@@ -78,28 +13,4 @@ public class ClassGroupTeacherSalary {
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
-
-    public BigDecimal getSalary() {
-        return salary;
-    }
-
-    public void setSalary(BigDecimal salary) {
-        this.salary = salary;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -17,8 +17,8 @@ public class Employee extends SysUser {
 	private Integer userId;
 	
 	/**  */
-	@ApiModelProperty(value = "机构编号",required = false)
-	private Integer organId;
+	@ApiModelProperty(value = "机构编号列表，逗号分隔",required = false)
+	private String organIdList;
 	
 	/** 工作性质（兼职、全职、临时） */
 	@ApiModelProperty(value = "工作性质",required = false)
@@ -73,15 +73,15 @@ public class Employee extends SysUser {
 	public Integer getUserId(){
 		return this.userId;
 	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
+
+	public String getOrganIdList() {
+		return organIdList;
 	}
-	
-	public Integer getOrganId(){
-		return this.organId;
+
+	public void setOrganIdList(String organIdList) {
+		this.organIdList = organIdList;
 	}
-			
+
 	public void setEducationBackground(String educationBackground){
 		this.educationBackground = educationBackground;
 	}

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

@@ -20,6 +20,10 @@ public class Organization {
 	/** 机构名称 */
 	@ApiModelProperty(value = "机构名称",required = false)
 	private String name;
+
+	/** 机构名称 */
+	@ApiModelProperty(value = "区域名称",required = false)
+	private String areaName;
 	
 	/** 区域编码 */
 	@ApiModelProperty(value = "区域编码",required = false)
@@ -50,6 +54,14 @@ public class Organization {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Organization> organizations;
 
+	public String getAreaName() {
+		return areaName;
+	}
+
+	public void setAreaName(String areaName) {
+		this.areaName = areaName;
+	}
+
 	public List<Organization> getOrganizations() {
 		return organizations;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentVipGroupQueryInfo.java

@@ -0,0 +1,30 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class StudentVipGroupQueryInfo extends QueryInfo {
+
+    private Long subjectId;
+
+    private Long classType;
+
+    public Long getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Long getClassType() {
+        return classType;
+    }
+
+    public void setClassType(Long classType) {
+        this.classType = classType;
+    }
+}

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

@@ -2,11 +2,9 @@ package com.ym.mec.biz.service;
 
 import java.util.List;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.HighClassGroup;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -75,6 +73,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 提高班批量添加
+     *
      * @param highClassGroupList
      * @return
      * @throws Exception
@@ -83,6 +82,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 获取老师乐团课程信息列表
+     *
      * @param teacherId
      * @return
      */
@@ -90,6 +90,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 获取老师VIP课程信息列表
+     *
      * @param queryInfo
      * @return
      */
@@ -98,9 +99,26 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 获取乐团班级老师课酬
+     *
      * @param musicGroupId
      * @return
      */
     List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId);
 
+    /**
+     * 获取乐团班级老师课酬
+     *
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId);
+
+
+    /**
+     * 获取学生所购买课程列表
+     *
+     * @param userId
+     * @return
+     */
+    List<CourseListDto> queryCoursePage(int userId);
 }

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

@@ -25,7 +25,7 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @param classGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> classGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(List classGroupList);
 
     /**
      * 批量更新教师薪酬

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

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ClassGroupTeacherSalaryService extends BaseService<Long, ClassGroupTeacherSalary> {
+    /**
+     * 获取乐团老师课酬配置
+     *
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeacherSalary> findByMusicGroupId(int musicGroupId);
+
+}

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.CourseScheduleDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -59,4 +60,12 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
      * 课程交换
      */
     void courseSwap(Long courseScheduleId1,Long courseScheduleId2);
+
+    /**
+     * 获取班级的课程计划
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<CourseSchedule> findClassGroupCourseSchedules(List classGroupList);
 }

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

@@ -1,8 +1,16 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.DemoGroupApplyDto;
 import com.ym.mec.biz.dal.entity.DemoGroup;
 import com.ym.mec.common.service.BaseService;
 
 public interface DemoGroupService extends BaseService<Long, DemoGroup> {
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/25
+     * 试听课申请
+     */
+    void demoGroupApply(DemoGroupApplyDto demoGroupApplyDto);
+
 }

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

@@ -22,4 +22,11 @@ public interface SysAreaService extends BaseService<Integer, SysArea> {
      * @return
      */
     List<SysArea> queryChild(TreeDto treeDto);
+
+    /**
+     * 根据子级区域获取父级节点
+     * @param id
+     * @return
+     */
+    SysArea getParentArea(Integer id);
 }

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

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.dto.VipGroupManageDetailDto;
 import com.ym.mec.biz.dal.entity.VipGroup;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
@@ -23,7 +24,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @Date: 2019/9/23
      * 获取可购买vip课列表
      */
-    PageInfo findStudentVipGroupList(QueryInfo queryInfo);
+    PageInfo findStudentVipGroupList(StudentVipGroupQueryInfo queryInfo);
 
     /**
      * @Author: Joburgess

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

@@ -2,10 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.HighClassGroup;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
@@ -15,14 +12,13 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 
+import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.math.BigDecimal;
+import java.time.*;
 import java.util.*;
 
 @Service
@@ -44,6 +40,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private CourseScheduleService courseScheduleService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;
+    @Autowired
+    private ClassGroupTeacherSalaryService classGroupTeacherSalaryService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -249,9 +247,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId) {
         List<ClassGroupTeachers> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId);
-        List<ClassGroup> classGroupList = Collections.unmodifiableList(classGroupAndTeachersList);
 
-        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupList);
+        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
 
         for (ClassGroupTeachers classGroupAndTeachers : classGroupAndTeachersList) {
             List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
@@ -264,4 +261,67 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroupAndTeachersList;
     }
+
+    @Override
+    public List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId) {
+        //乐团班级及班级老师
+        List<ClassGroupTeachers> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
+        //乐团的课程计划
+        List<CourseSchedule> classGroupCourseSchedules = courseScheduleService.findClassGroupCourseSchedules(classGroupAndTeachers);
+
+        //获取乐团老师课酬
+        List<ClassGroupTeacherSalary> nowClassGroupTeacherSalaryList = classGroupTeacherSalaryService.findByMusicGroupId(musicGroupId);
+
+        //基础课时
+        BigDecimal baseDuration = new BigDecimal("30");
+        for (ClassGroupTeachers classGroupAndTeacher : classGroupAndTeachers) {
+
+            Set<Long> courseScheduleDurationSet = new HashSet<>();
+            for (CourseSchedule classGroupCourseSchedule : classGroupCourseSchedules) {
+                if (classGroupCourseSchedule.getClassGroupId().equals(classGroupAndTeacher.getId())) {
+                    //课程时长
+                    long duration = (classGroupCourseSchedule.getEndClassTime().getTime() - classGroupCourseSchedule.getStartClassTime().getTime()) / (1000 * 60);
+                    courseScheduleDurationSet.add(duration);
+                }
+            }
+
+            //获取教师列表
+            List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAndTeacher.getClassGroupTeacherMapperList();
+
+            ArrayList<ClassGroupTeacherSalary> classGroupTeacherSalaryList = new ArrayList<>();
+            for (Long duration : courseScheduleDurationSet) {
+                THREE:
+                for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+
+                    //已经设置跳过计算
+                    for (ClassGroupTeacherSalary classGroupTeacherSalary : nowClassGroupTeacherSalaryList) {
+                        if (classGroupTeacherMapper.getClassGroupId().equals(classGroupTeacherSalary.getClassGroupId()) &&
+                                classGroupTeacherMapper.getUserId().equals(classGroupTeacherSalary.getUserId()) &&
+                                classGroupTeacherSalary.getDuration().equals(duration)
+                        ) {
+                            classGroupTeacherSalaryList.add(classGroupTeacherSalary);
+                            continue THREE;
+                        }
+                    }
+
+                    ClassGroupTeacherSalary classGroupTeacherSalary = new ClassGroupTeacherSalary();
+                    classGroupTeacherSalary.setMusicGroupId(classGroupTeacherMapper.getMusicGroupId());
+                    classGroupTeacherSalary.setClassGroupId(classGroupTeacherMapper.getClassGroupId());
+                    classGroupTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
+                    classGroupTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
+                    classGroupTeacherSalary.setDuration(duration.intValue());
+                    BigDecimal salary = new BigDecimal(duration).divide(baseDuration).multiply(classGroupTeacherMapper.getSalary()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                    classGroupTeacherSalary.setSalary(salary);
+                    classGroupTeacherSalaryList.add(classGroupTeacherSalary);
+                }
+            }
+            //教师课酬列表
+            classGroupAndTeacher.setClassGroupTeacherSalaryList(classGroupTeacherSalaryList);
+        }
+        return classGroupAndTeachers;
+    }
+
+    public List<CourseListDto> queryCoursePage(int userId) {
+        return classGroupDao.queryCoursePage(userId);
+    }
 }

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

@@ -31,7 +31,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
 
     @Override
-    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> ClassGroupList) {
+    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List ClassGroupList) {
         return classGroupTeacherMapperDao.findClassGroupTeachers(ClassGroupList);
     }
 

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

@@ -0,0 +1,29 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.ClassGroupTeacherSalaryDao;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.biz.service.ClassGroupTeacherSalaryService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ClassGroupTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ClassGroupTeacherSalary> implements ClassGroupTeacherSalaryService {
+
+    @Autowired
+    private ClassGroupTeacherSalaryDao ClassGroupTeacherSalaryDao;
+
+    @Override
+    public BaseDAO<Long, ClassGroupTeacherSalary> getDAO() {
+        return ClassGroupTeacherSalaryDao;
+    }
+
+
+    @Override
+    public List<ClassGroupTeacherSalary> findByMusicGroupId(int musicGroupId) {
+        return ClassGroupTeacherSalaryDao.findByMusicGroupId(musicGroupId);
+    }
+}

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

@@ -203,7 +203,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleDao.update(courseSchedules.get(1));
 	}
 
-	/**
+    @Override
+    public List<CourseSchedule> findClassGroupCourseSchedules(List classGroupList) {
+		return courseScheduleDao.findClassGroupCourseSchedules(classGroupList);
+    }
+
+    /**
 	 * @Author: Joburgess
 	 * @Date: 2019/9/24
 	 * 检测学生是否存在重复

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

@@ -1,5 +1,16 @@
 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.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.DemoGroupClassGroupMapperDao;
+import com.ym.mec.biz.dal.dao.DemoGroupCoursesPlanDao;
+import com.ym.mec.biz.dal.dto.DemoGroupApplyDto;
+import com.ym.mec.biz.dal.dto.VipGroupApplyBaseInfoDto;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,10 +25,45 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 	
 	@Autowired
 	private DemoGroupDao demoGroupDao;
+	@Autowired
+	private ClassGroupDao classGroupDao;
+	@Autowired
+	private DemoGroupClassGroupMapperDao demoGroupClassGroupMapperDao;
+	@Autowired
+	private DemoGroupCoursesPlanDao demoGroupCoursesPlanDao;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Long, DemoGroup> getDAO() {
 		return demoGroupDao;
 	}
-	
+
+	@Override
+	public void demoGroupApply(DemoGroupApplyDto demoGroupApplyDto) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		demoGroupApplyDto.setUserId(user.getId());
+		demoGroupDao.insert(demoGroupApplyDto);
+		ClassGroup classGroup=new ClassGroup();
+		classGroup.setName(demoGroupApplyDto.getName());
+		classGroup.setType(ClassGroupTypeEnum.DEMO);
+		classGroup.setDelFlag(YesOrNoEnum.NO);
+		classGroupDao.insert(classGroup);
+		DemoGroupClassGroupMapper demoGroupClassGroupMapper=new DemoGroupClassGroupMapper();
+		demoGroupClassGroupMapper.setDemoGroupId(demoGroupApplyDto.getId());
+		demoGroupClassGroupMapper.setClassGroupId(classGroup.getId());
+		demoGroupClassGroupMapperDao.insert(demoGroupClassGroupMapper);
+		demoGroupCoursesPlanDao.batchInsertByDates(demoGroupApplyDto.getCourseDates(),demoGroupApplyDto.getId());
+	}
+
+	/**
+	 * @Author: Joburgess
+	 * @Date: 2019/9/25
+	 * 创建上课计划及跟新所属分部列表
+	 */
+	public void createCourseScheduleAndUpdateOrganId(Long demoGroupId){
+		DemoGroup demoGroup=demoGroupDao.get(demoGroupId);
+
+	}
 }

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

@@ -39,6 +39,11 @@ public class SysAreaServiceImpl extends BaseServiceImpl<Integer, SysArea> implem
 		return sysAreaDao.findRootList(treeDto.getParentId(),treeDto.getDelFlag());
 	}
 
+	@Override
+	public SysArea getParentArea(Integer id) {
+		return sysAreaDao.getParentArea(id);
+	}
+
 	private SysArea getTree(SysArea area){
 		//得到根节点对象
 		//获取子节点list

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.VipGroupService;
@@ -70,7 +71,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
-	public PageInfo findStudentVipGroupList(QueryInfo queryInfo) {
+	public PageInfo findStudentVipGroupList(StudentVipGroupQueryInfo queryInfo) {
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);

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

@@ -255,4 +255,35 @@
     <select id="findClassGroupByMusicGroupId" resultMap="ClassGroupTeachers">
         SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND del_flag_ = 0;
     </select>
+
+    <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
+        <result column="id_" property="musicGroupName"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_list_" property="teachMode"/>
+        <result column="name_" property="totalClassTimes"/>
+        <result column="student_num_" property="currentClassTimes"/>
+        <result column="create_time_" property="studentNames"/>
+        <result column="update_time_" property="teacherName"/>
+        <result column="type_" property="address"/>
+    </resultMap>
+    <select id="queryCoursePage" resultMap="CourseListDto">
+        SELECT * FROM (
+            SELECT cg.type_,s.address_,mg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_
+            FROM student_registration sr
+            LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
+            WHERE sr.user_id_ = #{userId} AND cg.type_ != 'VIP'
+            UNION ALL
+            SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_
+            FROM class_group_student_mapper cgsm
+            LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+            LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
+            LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
+            WHERE cgsm.user_id_ = #{userId} AND cg.type_ = 'VIP') a
+            ORDER BY a.create_time_ DESC
+    </select>
 </mapper>

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

@@ -12,11 +12,6 @@
     <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
-  <sql id="Base_Column_List">
-    
-    id_, music_group_id_, class_group_id_, teacher_role_, user_id_, duration_, salary_, 
-    create_time_, update_time_
-  </sql>
   <select id="get" parameterType="java.lang.Long" resultMap="ClassGroupTeacherSalary">
      select * from class_group_teacher_salary where id_ = #{id}
   </select>
@@ -121,4 +116,10 @@
   <select id="queryCount" resultType="int">
     SELECT COUNT(*) FROM class_group_teacher_salary
   </select>
+
+  <!-- 获取乐团老师课酬配置表 -->
+  <select id="findByMusicGroupId" resultMap="ClassGroupTeacherSalary">
+    SELECT * FROM class_group_teacher_salary WHERE music_group_id_ = #{musicGroupId}
+  </select>
+
 </mapper>

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

@@ -294,4 +294,13 @@
             #{id}
         </foreach>
     </select>
+
+    <!-- 获取班级的课程 -->
+    <select id="findClassGroupCourseSchedules" resultMap="CourseSchedule">
+        SELECT * FROM course_schedule
+        WHERE class_group_id_ IN
+        <foreach collection="classGroupList" item="classGroup" index="index" open="(" close=")" separator=",">
+            #{classGroup.id}
+        </foreach>
+    </select>
 </mapper>

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

@@ -24,13 +24,27 @@
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+	<insert id="batchInsertByDates" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!--
 		<selectKey resultClass="int" keyProperty="id" > 
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO demo_group_courses_plan (id_,demo_group_id_,courses_start_time_,create_time_) VALUES(#{id},#{demoGroupId},#{coursesStartTime},#{createTime})
+		INSERT INTO demo_group_courses_plan (demo_group_id_,courses_start_time_,create_time_)
+		VALUE
+		<foreach collection="dates" item="date" separator=",">
+			(#{demoGroupId},#{date},now())
+		</foreach>
+	</insert>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" >
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+		</selectKey>
+		-->
+		INSERT INTO demo_group_courses_plan (id_,demo_group_id_,courses_start_time_,create_time_) VALUES(#{id},#{demoGroupId},#{coursesStartTime},now())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->

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

@@ -8,7 +8,7 @@
 
 	<resultMap type="com.ym.mec.biz.dal.entity.Employee" id="Employee">
 		<result column="user_id_" property="userId" />
-		<result column="organ_id_" property="organId" />
+		<result column="organ_id_list" property="organIdList" />
 		<result column="job_nature_" property="jobNature" />
 		<result column="is_probation_period_" property="isProbationPeriod" />
 		<result column="education_background_" property="educationBackground" />
@@ -40,7 +40,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO employee (user_id_,organ_id_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_) VALUES(#{userId},#{organId},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},#{updateTime},#{createTime},#{introduction},#{demissionDate})
+		INSERT INTO employee (user_id_,organ_id_list,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_) VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},#{updateTime},#{createTime},#{introduction},#{demissionDate})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -53,7 +53,7 @@
         graduate_school_ = #{graduateSchool},
         </if>
         <if test="organId != null">
-        organ_id_ = #{organId},
+            organ_id_list = #{organIdList},
         </if>
         <if test="introduction != null">
         introduction_ = #{introduction},
@@ -96,7 +96,7 @@
     </update>
 
     <update id="updateUserLockStatus">
-		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,9,0) WHERE id_=#{userID}
+		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,1,0) WHERE id_=#{userID}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -130,6 +130,7 @@
 
     <sql id="queryCondition">
         <where>
+            su.user_type_='SYSTEM'
             <if test="organId != null">
                 and su.organ_id_ = #{organId}
             </if>

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

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.Organization" id="Organization">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
+        <result column="area_name_" property="areaName"/>
         <result column="area_id_" property="areaId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -76,14 +77,14 @@
     <sql id="queryPageSql">
         <where>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
     </sql>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Organization" parameterType="map">
-        SELECT * FROM organization
+        SELECT o.*,sa.name_ area_name_ FROM organization o LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
         <include refid="queryPageSql"/>
          ORDER BY id_
         <include refid="global.limit"/>
@@ -91,12 +92,15 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM organization <include refid="queryPageSql"/>
+		SELECT COUNT(o.id_) FROM organization o <include refid="queryPageSql"/>
 	</select>
 
     <select id="findByParentId" resultMap="Organization">
-        SELECT * FROM organization <include refid="queryPageSql"/>
+        SELECT o.*,sa.name_ area_name_ FROM organization o
+        LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
+        <include refid="queryPageSql"/>
     </select>
+
     <select id="findByOrganIds" resultType="java.lang.String">
         SELECT name_ FROM organization IN (#{organIds}) WHERE del_flag_ = 0
     </select>

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

@@ -80,4 +80,7 @@
         SELECT * FROM sys_area WHERE parent_organ_id_ = #{parentId}
         AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
+    <select id="getParentArea" resultMap="SysArea">
+        SELECT * FROM sys_area WHERE id_ = (SELECT parent_organ_id_ FROM sys_area WHERE id_ = #{id})
+    </select>
 </mapper>

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

@@ -145,7 +145,16 @@
 		SELECT COUNT(*) FROM vip_group
 	</select>
 
-
+    <sql id="studentVipGroupQueryCondition">
+        <where>
+            <if test="subjectId!=null">
+                FIND_IN_SET(#{subjectId},cg.subject_id_list_)
+            </if>
+            <if test="classType!=null">
+                AND cg.teach_mode_=#{classType}
+            </if>
+        </where>
+    </sql>
 
     <select id="findVipGroups" resultMap="studentVipGroup">
        SELECT
@@ -166,6 +175,7 @@
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             LEFT JOIN class_group_teacher_mapper cgtm ON vgcgm.class_group_id_=cgtm.class_group_id_
             LEFT JOIN sys_user su ON cgtm.user_id_=su.id_
+            <include refid="studentVipGroupQueryCondition"/>
         ORDER BY vg.id_ DESC
         <include refid="global.limit"/>
     </select>
@@ -174,6 +184,9 @@
             count(*)
         FROM
             vip_group vg
+        LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_=vgcgm.vip_group_id_
+        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
+        <include refid="studentVipGroupQueryCondition"/>
     </select>
     <select id="getVipGroupBaseInfo" resultMap="vipGroupManageDetailDto">
         SELECT

mec-client-api/src/main/java/com/ym/im/ImFeignService.java

@@ -1,15 +1,54 @@
 package com.ym.im;
 
-import com.ym.im.fallback.ImFeignServiceFallback;
-import com.ym.mec.common.config.RequestHeaderConfiguration;
-import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "im-server", configuration = RequestHeaderConfiguration.class, fallback = ImFeignServiceFallback.class)
+import com.ym.im.fallback.ImFeignServiceFallback;
+import com.ym.mec.common.config.FeignConfiguration;
+import com.ym.mec.common.entity.ImGroupModel;
+import com.ym.mec.common.entity.ImUserModel;
+
+@FeignClient(name = "im-server", configuration = FeignConfiguration.class, fallback = ImFeignServiceFallback.class)
 public interface ImFeignService {
 
+    /**
+     * 用户注册
+     * @param userModel
+     * @return
+     */
     @PostMapping(value = "user/register")
     Object getUser(@RequestBody ImUserModel userModel);
+
+    /**
+     * 创建群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/create")
+    Object groupCreate(@RequestBody ImGroupModel groupModel);
+
+    /**
+     * 加入群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/join")
+    Object groupJoin(@RequestBody ImGroupModel groupModel);
+
+    /**
+     * 退出群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/quit")
+    Object groupQuit(@RequestBody ImGroupModel groupModel);
+
+    /**
+     * 解散群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/dismiss")
+    Object groupDismiss(@RequestBody ImGroupModel groupModel);
 }

mec-client-api/src/main/java/com/ym/im/fallback/ImFeignServiceFallback.java

@@ -1,6 +1,7 @@
 package com.ym.im.fallback;
 
 import com.ym.im.ImFeignService;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.stereotype.Component;
 
@@ -10,4 +11,24 @@ public class ImFeignServiceFallback implements ImFeignService {
     public Object getUser(ImUserModel userModel) {
         return null;
     }
+
+    @Override
+    public Object groupCreate(ImGroupModel groupModel) {
+        return null;
+    }
+
+    @Override
+    public Object groupJoin(ImGroupModel groupModel) {
+        return null;
+    }
+
+    @Override
+    public Object groupQuit(ImGroupModel groupModel) {
+        return null;
+    }
+
+    @Override
+    public Object groupDismiss(ImGroupModel groupModel) {
+        return null;
+    }
 }

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupMember.java

@@ -0,0 +1,41 @@
+package com.ym.mec.common.entity;
+
+public class ImGroupMember {
+    public String id;
+    public String groupId;
+    public Integer munite;
+
+    public ImGroupMember() {
+    }
+
+    public ImGroupMember(String id, String groupId, Integer munite) {
+        this.id = id;
+        this.groupId = groupId;
+        this.munite = munite;
+    }
+
+    public ImGroupMember setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public String getGroupId() {
+        return this.groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getMunite() {
+        return this.munite;
+    }
+
+    public void setMunite(Integer munite) {
+        this.munite = munite;
+    }
+}

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupModel.java

@@ -0,0 +1,69 @@
+package com.ym.mec.common.entity;
+
+public class ImGroupModel {
+    private String id;
+    private ImGroupMember[] members;
+    private String name;
+    private Integer minute;
+    private Integer status;
+
+    public ImGroupModel() {
+    }
+
+    public ImGroupModel(String id, ImGroupMember[] members, String name, Integer minute) {
+        this.id = id;
+        this.members = members;
+        this.name = name;
+        this.minute = minute;
+    }
+
+    public ImGroupModel(String id, Integer status) {
+        this.id = id;
+        this.status = status;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public ImGroupModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public ImGroupMember[] getMembers() {
+        return this.members;
+    }
+
+    public ImGroupModel setMembers(ImGroupMember[] members) {
+        this.members = members;
+        return this;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public ImGroupModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getMinute() {
+        return this.minute;
+    }
+
+    public ImGroupModel setMinute(Integer minute) {
+        this.minute = minute;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return this.status;
+    }
+
+    public ImGroupModel setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+}

mec-education/pom.xml

@@ -47,28 +47,51 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.ym</groupId>
-			<artifactId>mec-biz</artifactId>
-		</dependency>
-
-		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<version>3.1.0</version>
 		</dependency>
-
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-extension</artifactId>
-			<version>3.1.0</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<version>1.18.4</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-generate</artifactId>
+			<version>2.3.3</version>
+		</dependency>
+		<!-- 模板引擎 -->
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-engine-core</artifactId>
+			<version>2.0</version>
+		</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>5.1.9.RELEASE</version>
+			<scope>compile</scope>
+		</dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>javax.persistence-api</artifactId>
+		</dependency>
+
 	</dependencies>
 	<build>
 		<plugins>

mec-education/src/main/java/com/ym/mec/education/EducationApplication.java

@@ -1,23 +1,18 @@
 package com.ym.mec.education;
 
+import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
 
-import com.spring4all.swagger.EnableSwagger2Doc;
-
+@MapperScan("com.ym.mec.education.mapper*")
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = "com.ym.mec")
 @Configuration
 @EnableSwagger2Doc
 public class EducationApplication {

mec-education/src/main/java/com/ym/mec/education/base/BaseResponse.java

@@ -0,0 +1,31 @@
+package com.ym.mec.education.base;
+
+import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:53
+ */
+@MappedSuperclass
+public class BaseResponse<T> extends Response implements Serializable {
+    protected T dataInfo;
+
+    public BaseResponse() {
+    }
+
+    public T getDataInfo() {
+        return this.dataInfo;
+    }
+
+    public void setDataInfo(final T dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseResponse(super=" + super.toString() + ", dataInfo=" + this.getDataInfo() + ")";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/base/PageResponse.java

@@ -0,0 +1,168 @@
+package com.ym.mec.education.base;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:53
+ */
+public class PageResponse<T> extends Response implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private List<T> records;
+    private Integer total;
+    private Integer size;
+    private Integer pages;
+    private Integer current;
+    private boolean searchCount;
+    private boolean optimizeCount;
+    private String orderByField;
+    private boolean isAsc;
+
+    public PageResponse() {
+        this.records = Collections.emptyList();
+        this.size = 10;
+        this.current = 1;
+        this.searchCount = true;
+        this.optimizeCount = false;
+        this.isAsc = true;
+    }
+
+    public PageResponse(Integer current, Integer size) {
+        this(current, size, true);
+    }
+
+    public PageResponse(Integer current, Integer size, String orderByField) {
+        this.records = Collections.emptyList();
+        this.setOrderByField(orderByField);
+    }
+
+    public PageResponse(Integer current, Integer size, boolean searchCount) {
+        this.records = Collections.emptyList();
+        this.size = 10;
+        this.current = 1;
+        this.searchCount = true;
+        this.optimizeCount = false;
+        this.isAsc = true;
+        if (current > 1) {
+            this.current = current;
+        }
+
+        this.size = size;
+        this.searchCount = searchCount;
+    }
+
+    public List<T> getRecords() {
+        return this.records;
+    }
+
+    public void setRecords(List<T> records) {
+        this.records = records;
+    }
+
+    protected static Integer offsetCurrent(Integer current, Integer size) {
+        return current > 0 ? (current - 1) * size : 0;
+    }
+
+    public Integer getOffsetCurrent() {
+        return offsetCurrent(this.current, this.size);
+    }
+
+    public boolean hasPrevious() {
+        return this.current > 1;
+    }
+
+    public boolean hasNext() {
+        return this.current < this.pages;
+    }
+
+    public Integer getTotal() {
+        return this.total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getSize() {
+        return this.size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public Integer getPages() {
+        if (this.size != null && 0 != this.size && this.total != null) {
+            this.pages = this.total / this.size;
+            if (this.total % this.size != 0) {
+                this.pages = this.pages + 1;
+            }
+
+            return this.pages;
+        } else {
+            return null;
+        }
+    }
+
+    public void setCurrent(Integer current) {
+        this.current = current;
+    }
+
+    public Integer getCurrent() {
+        return this.current;
+    }
+
+    public boolean isSearchCount() {
+        return this.searchCount;
+    }
+
+    public void setSearchCount(boolean searchCount) {
+        this.searchCount = searchCount;
+    }
+
+    public boolean isOptimizeCount() {
+        return this.optimizeCount;
+    }
+
+    public void setOptimizeCount(boolean optimizeCount) {
+        this.optimizeCount = optimizeCount;
+    }
+
+    public String getOrderByField() {
+        return this.orderByField;
+    }
+
+    public void setOrderByField(String orderByField) {
+        if (StringUtils.isNotEmpty(orderByField)) {
+            this.orderByField = orderByField;
+        }
+
+    }
+
+    public boolean isAsc() {
+        return this.isAsc;
+    }
+
+    public void setAsc(boolean isAsc) {
+        this.isAsc = isAsc;
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer pg = new StringBuffer();
+        pg.append(" Page:{ [").append(super.toString()).append("], ");
+        if (this.records != null) {
+            pg.append("records-size:").append(this.records.size());
+        } else {
+            pg.append("records is null");
+        }
+
+        return pg.append(" }").toString();
+    }
+
+}

mec-education/src/main/java/com/ym/mec/education/base/Response.java

@@ -0,0 +1,100 @@
+package com.ym.mec.education.base;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:50
+ */
+import java.io.Serializable;
+
+public class Response implements Serializable {
+    protected Integer returnCode;
+    protected String message;
+    protected String chainId;
+
+    public Response() {
+    }
+
+    public Integer getReturnCode() {
+        return this.returnCode;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public String getChainId() {
+        return this.chainId;
+    }
+
+    public void setReturnCode(final Integer returnCode) {
+        this.returnCode = returnCode;
+    }
+
+    public void setMessage(final String message) {
+        this.message = message;
+    }
+
+    public void setChainId(final String chainId) {
+        this.chainId = chainId;
+    }
+    @Override
+    public boolean equals(final Object o) {
+        if (o == this) {
+            return true;
+        } else if (!(o instanceof Response)) {
+            return false;
+        } else {
+            Response other = (Response) o;
+            if (!other.canEqual(this)) {
+                return false;
+            } else {
+                label47:
+                {
+                    Object this$returnCode = this.getReturnCode();
+                    Object other$returnCode = other.getReturnCode();
+                    if (this$returnCode == null) {
+                        if (other$returnCode == null) {
+                            break label47;
+                        }
+                    } else if (this$returnCode.equals(other$returnCode)) {
+                        break label47;
+                    }
+
+                    return false;
+                }
+
+                Object this$message = this.getMessage();
+                Object other$message = other.getMessage();
+                if (this$message == null) {
+                    if (other$message != null) {
+                        return false;
+                    }
+                } else if (!this$message.equals(other$message)) {
+                    return false;
+                }
+
+                Object this$chainId = this.getChainId();
+                Object other$chainId = other.getChainId();
+                if (this$chainId == null) {
+                    if (other$chainId != null) {
+                        return false;
+                    }
+                } else if (!this$chainId.equals(other$chainId)) {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+
+    protected boolean canEqual(final Object other) {
+        return other instanceof Response;
+    }
+
+    @Override
+    public String toString() {
+        return "Response(returnCode=" + this.getReturnCode() + ", message=" + this.getMessage() + ", chainId=" + this.getChainId() + ")";
+    }
+}

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

@@ -1,3 +1,4 @@
+/*
 package com.ym.mec.education.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,3 +32,4 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	}
 
 }
+*/

mec-education/src/main/java/com/ym/mec/education/config/WebMvcConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.ym.mec.education.config;
 
 import java.io.IOException;
@@ -9,6 +10,8 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
+import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.enums.BaseEnum;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -32,15 +35,15 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
-import com.ym.mec.common.config.EnumConverterFactory;
-import com.ym.mec.common.enums.BaseEnum;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
-	/**
+	*/
+/**
 	 * 枚举类的转换器 addConverterFactory
-	 */
+	 *//*
+
 	@Override
 	public void addFormatters(FormatterRegistry registry) {
 		registry.addConverterFactory(new EnumConverterFactory());
@@ -104,3 +107,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	}
 
 }
+*/

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

@@ -0,0 +1,38 @@
+package com.ym.mec.education.controller;
+
+import com.netflix.hystrix.contrib.javanica.annotation.DefaultProperties;
+import com.ym.mec.education.base.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.persistence.GenerationType;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:39
+ */
+@RestController(value = "musicGroup")
+@DefaultProperties(defaultFallback = "defaultFallback")
+@Slf4j
+public class MusicGroupController {
+    /**
+     * 服务降级处理
+     *
+     * @return
+     */
+    private BaseResponse defaultFallback() {
+        BaseResponse response = new BaseResponse();
+        response.setReturnCode(500);
+        response.setMessage("太拥挤了, 请稍后再试!");
+        return response;
+    }
+
+    @GetMapping(value = "/say")
+    public String say(){
+
+        return  "utyrewertyu";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ChargeType.java

@@ -0,0 +1,129 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 收费类型
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("charge_type")
+public class ChargeType extends Model<ChargeType> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 名称
+     */
+    @TableField("name_")
+    private String name;
+    @TableField("del_flag_")
+    private String delFlag;
+    /**
+     * 描述
+     */
+    @TableField("description_")
+    private String description;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 默认课程形态
+     */
+    @TableField("course_form_")
+    private String courseForm;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public ChargeType setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ChargeType setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public ChargeType setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public ChargeType setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ChargeType setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public ChargeType setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getCourseForm() {
+        return courseForm;
+    }
+
+    public ChargeType setCourseForm(String courseForm) {
+        this.courseForm = courseForm;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ChargeType{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", delFlag=" + delFlag +
+        ", description=" + description +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", courseForm=" + courseForm +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ChargeTypeSubjectMapper.java

@@ -0,0 +1,134 @@
+package com.ym.mec.education.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 收费类型与科目的关联表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("charge_type_subject_mapper")
+public class ChargeTypeSubjectMapper extends Model<ChargeTypeSubjectMapper> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Long id;
+    @TableField("charge_type_id_")
+    private Integer chargeTypeId;
+    @TableField("subject_id_")
+    private Integer subjectId;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("kit_group_purchase_type_")
+    private String kitGroupPurchaseType;
+    @TableField("deposit_fee_")
+    private BigDecimal depositFee;
+    @TableField("fee_")
+    private BigDecimal fee;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public ChargeTypeSubjectMapper setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getChargeTypeId() {
+        return chargeTypeId;
+    }
+
+    public ChargeTypeSubjectMapper setChargeTypeId(Integer chargeTypeId) {
+        this.chargeTypeId = chargeTypeId;
+        return this;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public ChargeTypeSubjectMapper setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ChargeTypeSubjectMapper setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public ChargeTypeSubjectMapper setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getKitGroupPurchaseType() {
+        return kitGroupPurchaseType;
+    }
+
+    public ChargeTypeSubjectMapper setKitGroupPurchaseType(String kitGroupPurchaseType) {
+        this.kitGroupPurchaseType = kitGroupPurchaseType;
+        return this;
+    }
+
+    public BigDecimal getDepositFee() {
+        return depositFee;
+    }
+
+    public ChargeTypeSubjectMapper setDepositFee(BigDecimal depositFee) {
+        this.depositFee = depositFee;
+        return this;
+    }
+
+    public BigDecimal getFee() {
+        return fee;
+    }
+
+    public ChargeTypeSubjectMapper setFee(BigDecimal fee) {
+        this.fee = fee;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ChargeTypeSubjectMapper{" +
+        ", id=" + id +
+        ", chargeTypeId=" + chargeTypeId +
+        ", subjectId=" + subjectId +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", kitGroupPurchaseType=" + kitGroupPurchaseType +
+        ", depositFee=" + depositFee +
+        ", fee=" + fee +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroup.java

@@ -0,0 +1,216 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("class_group")
+public class ClassGroup extends Model<ClassGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    /**
+     * 科目列表（用逗号分隔）
+     */
+    @TableField("subject_id_list_")
+    private String subjectIdList;
+    /**
+     * 班级名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 预计招生人数
+     */
+    @TableField("expect_student_num_")
+    private Integer expectStudentNum;
+    /**
+     * 实际学生数
+     */
+    @TableField("student_num_")
+    private Integer studentNum;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 班级类型(普通班级、合奏班级、提高课班级、VIP班级、试听课)
+     */
+    @TableField("type_")
+    private String type;
+    /**
+     * 班级状态()
+     */
+    @TableField("del_flag_")
+    private String delFlag;
+    /**
+     * 教学形式（线上、线下）
+     */
+    @TableField("teach_mode_")
+    private String teachMode;
+    /**
+     * 总课次
+     */
+    @TableField("total_class_times_")
+    private Integer totalClassTimes;
+    @TableField("current_class_times_")
+    private Integer currentClassTimes;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public ClassGroup setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public ClassGroup setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public String getSubjectIdList() {
+        return subjectIdList;
+    }
+
+    public ClassGroup setSubjectIdList(String subjectIdList) {
+        this.subjectIdList = subjectIdList;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ClassGroup setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getExpectStudentNum() {
+        return expectStudentNum;
+    }
+
+    public ClassGroup setExpectStudentNum(Integer expectStudentNum) {
+        this.expectStudentNum = expectStudentNum;
+        return this;
+    }
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public ClassGroup setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ClassGroup setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public ClassGroup setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public ClassGroup setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public ClassGroup setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public String getTeachMode() {
+        return teachMode;
+    }
+
+    public ClassGroup setTeachMode(String teachMode) {
+        this.teachMode = teachMode;
+        return this;
+    }
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public ClassGroup setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+        return this;
+    }
+
+    public Integer getCurrentClassTimes() {
+        return currentClassTimes;
+    }
+
+    public ClassGroup setCurrentClassTimes(Integer currentClassTimes) {
+        this.currentClassTimes = currentClassTimes;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassGroup{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", subjectIdList=" + subjectIdList +
+        ", name=" + name +
+        ", expectStudentNum=" + expectStudentNum +
+        ", studentNum=" + studentNum +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", type=" + type +
+        ", delFlag=" + delFlag +
+        ", teachMode=" + teachMode +
+        ", totalClassTimes=" + totalClassTimes +
+        ", currentClassTimes=" + currentClassTimes +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupRelation.java

@@ -0,0 +1,90 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级关系表(定义合奏课的班级信息)
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("class_group_relation")
+public class ClassGroupRelation extends Model<ClassGroupRelation> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 班级id
+     */
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 子班id
+     */
+    @TableField("sub_class_group_id_")
+    private Integer subClassGroupId;
+    @TableField("create_time_")
+    private Date createTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public ClassGroupRelation setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public ClassGroupRelation setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public Integer getSubClassGroupId() {
+        return subClassGroupId;
+    }
+
+    public ClassGroupRelation setSubClassGroupId(Integer subClassGroupId) {
+        this.subClassGroupId = subClassGroupId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ClassGroupRelation setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassGroupRelation{" +
+                ", id=" + id +
+                ", classGroupId=" + classGroupId +
+                ", subClassGroupId=" + subClassGroupId +
+                ", createTime=" + createTime +
+                "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupStudentMapper.java

@@ -0,0 +1,105 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级、学生关系表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("class_group_student_mapper")
+public class ClassGroupStudentMapper extends Model<ClassGroupStudentMapper> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 班级
+     */
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 学生
+     */
+    @TableField("user_id_")
+    private Integer userId;
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 状态（在读、请假、休学、退学）
+     */
+    @TableField("status_")
+    private String status;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public ClassGroupStudentMapper setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public ClassGroupStudentMapper setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public ClassGroupStudentMapper setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ClassGroupStudentMapper setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public ClassGroupStudentMapper setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassGroupStudentMapper{" +
+        ", id=" + id +
+        ", classGroupId=" + classGroupId +
+        ", userId=" + userId +
+        ", createTime=" + createTime +
+        ", status=" + status +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupTeacherMapper.java

@@ -0,0 +1,139 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级与老师的关联表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("class_group_teacher_mapper")
+public class ClassGroupTeacherMapper extends Model<ClassGroupTeacherMapper> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 老师角色（主教、助教）
+     */
+    @TableField("teacher_role_")
+    private String teacherRole;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 薪酬
+     */
+    @TableField("salary_")
+    private BigDecimal salary;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public ClassGroupTeacherMapper setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public ClassGroupTeacherMapper setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public ClassGroupTeacherMapper setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public String getTeacherRole() {
+        return teacherRole;
+    }
+
+    public ClassGroupTeacherMapper setTeacherRole(String teacherRole) {
+        this.teacherRole = teacherRole;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public ClassGroupTeacherMapper setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public BigDecimal getSalary() {
+        return salary;
+    }
+
+    public ClassGroupTeacherMapper setSalary(BigDecimal salary) {
+        this.salary = salary;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ClassGroupTeacherMapper setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public ClassGroupTeacherMapper setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassGroupTeacherMapper{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", classGroupId=" + classGroupId +
+        ", teacherRole=" + teacherRole +
+        ", userId=" + userId +
+        ", salary=" + salary +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupTeacherSalary.java

@@ -0,0 +1,154 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级与老师课酬表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("class_group_teacher_salary")
+public class ClassGroupTeacherSalary extends Model<ClassGroupTeacherSalary> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 老师角色（主教、助教）
+     */
+    @TableField("teacher_role_")
+    private String teacherRole;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 课时长(分钟)
+     */
+    @TableField("duration_")
+    private Integer duration;
+    /**
+     * 薪酬
+     */
+    @TableField("salary_")
+    private BigDecimal salary;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public ClassGroupTeacherSalary setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public ClassGroupTeacherSalary setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public ClassGroupTeacherSalary setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public String getTeacherRole() {
+        return teacherRole;
+    }
+
+    public ClassGroupTeacherSalary setTeacherRole(String teacherRole) {
+        this.teacherRole = teacherRole;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public ClassGroupTeacherSalary setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getDuration() {
+        return duration;
+    }
+
+    public ClassGroupTeacherSalary setDuration(Integer duration) {
+        this.duration = duration;
+        return this;
+    }
+
+    public BigDecimal getSalary() {
+        return salary;
+    }
+
+    public ClassGroupTeacherSalary setSalary(BigDecimal salary) {
+        this.salary = salary;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public ClassGroupTeacherSalary setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public ClassGroupTeacherSalary setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassGroupTeacherSalary{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", classGroupId=" + classGroupId +
+        ", teacherRole=" + teacherRole +
+        ", userId=" + userId +
+        ", duration=" + duration +
+        ", salary=" + salary +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/CooperationOrgan.java

@@ -0,0 +1,162 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 合作单位
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("cooperation_organ")
+public class CooperationOrgan extends Model<CooperationOrgan> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    @TableField("organ_id_")
+    private Integer organId;
+    /**
+     * 单位名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 联系人
+     */
+    @TableField("linkman_")
+    private String linkman;
+    @TableField("job_")
+    private String job;
+    @TableField("mobile_no_")
+    private String mobileNo;
+    @TableField("address_")
+    private String address;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("del_flag_")
+    private String delFlag;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public CooperationOrgan setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public CooperationOrgan setOrganId(Integer organId) {
+        this.organId = organId;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public CooperationOrgan setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public CooperationOrgan setLinkman(String linkman) {
+        this.linkman = linkman;
+        return this;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public CooperationOrgan setJob(String job) {
+        this.job = job;
+        return this;
+    }
+
+    public String getMobileNo() {
+        return mobileNo;
+    }
+
+    public CooperationOrgan setMobileNo(String mobileNo) {
+        this.mobileNo = mobileNo;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public CooperationOrgan setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public CooperationOrgan setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public CooperationOrgan setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public CooperationOrgan setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CooperationOrgan{" +
+        ", id=" + id +
+        ", organId=" + organId +
+        ", name=" + name +
+        ", linkman=" + linkman +
+        ", job=" + job +
+        ", mobileNo=" + mobileNo +
+        ", address=" + address +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", delFlag=" + delFlag +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/CourseHomework.java

@@ -0,0 +1,183 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 课程作业表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("course_homework")
+public class CourseHomework extends Model<CourseHomework> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("course_schedule_id_")
+    private Long courseScheduleId;
+    /**
+     * 附件地址（多个用逗号分隔）
+     */
+    @TableField("attachments_")
+    private String attachments;
+    /**
+     * 作业内容
+     */
+    @TableField("content_")
+    private String content;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 截止日期
+     */
+    @TableField("expiry_date_")
+    private Date expiryDate;
+    /**
+     * 完成人数
+     */
+    @TableField("completed_num_")
+    private Integer completedNum;
+    /**
+     * 预计人数
+     */
+    @TableField("expect_num_")
+    private Integer expectNum;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public CourseHomework setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public CourseHomework setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+        return this;
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public CourseHomework setAttachments(String attachments) {
+        this.attachments = attachments;
+        return this;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public CourseHomework setContent(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public CourseHomework setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public CourseHomework setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public CourseHomework setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public CourseHomework setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public Date getExpiryDate() {
+        return expiryDate;
+    }
+
+    public CourseHomework setExpiryDate(Date expiryDate) {
+        this.expiryDate = expiryDate;
+        return this;
+    }
+
+    public Integer getCompletedNum() {
+        return completedNum;
+    }
+
+    public CourseHomework setCompletedNum(Integer completedNum) {
+        this.completedNum = completedNum;
+        return this;
+    }
+
+    public Integer getExpectNum() {
+        return expectNum;
+    }
+
+    public CourseHomework setExpectNum(Integer expectNum) {
+        this.expectNum = expectNum;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CourseHomework{" +
+        ", id=" + id +
+        ", courseScheduleId=" + courseScheduleId +
+        ", attachments=" + attachments +
+        ", content=" + content +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", musicGroupId=" + musicGroupId +
+        ", classGroupId=" + classGroupId +
+        ", expiryDate=" + expiryDate +
+        ", completedNum=" + completedNum +
+        ", expectNum=" + expectNum +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/CourseHomeworkTemplate.java

@@ -0,0 +1,141 @@
+package com.ym.mec.education.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 课程作业模板
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("course_homework_template")
+public class CourseHomeworkTemplate extends Model<CourseHomeworkTemplate> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 模板名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 模板内容
+     */
+    @TableField("content_")
+    private String content;
+    @TableField("del_flag_")
+    private String delFlag;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 班级类型(普通班级、合奏班级、提高课班级、VIP班级)
+     */
+    @TableField("class_group_type_")
+    private String classGroupType;
+    @TableField("subject_id_")
+    private Integer subjectId;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public CourseHomeworkTemplate setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public CourseHomeworkTemplate setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public CourseHomeworkTemplate setContent(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public CourseHomeworkTemplate setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public CourseHomeworkTemplate setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public CourseHomeworkTemplate setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getClassGroupType() {
+        return classGroupType;
+    }
+
+    public CourseHomeworkTemplate setClassGroupType(String classGroupType) {
+        this.classGroupType = classGroupType;
+        return this;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public CourseHomeworkTemplate setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CourseHomeworkTemplate{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", content=" + content +
+        ", delFlag=" + delFlag +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", classGroupType=" + classGroupType +
+        ", subjectId=" + subjectId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/CourseSchedule.java

@@ -0,0 +1,223 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 课程计划表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("course_schedule")
+public class CourseSchedule extends Model<CourseSchedule> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 班级编号
+     */
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 课程状态
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 补贴
+     */
+    @TableField("subsidy_")
+    private BigDecimal subsidy;
+    /**
+     * 上课日期
+     */
+    @TableField("class_date_")
+    private Date classDate;
+    /**
+     * 上课时间
+     */
+    @TableField("start_class_time_")
+    private Date startClassTime;
+    /**
+     * 结束时间
+     */
+    @TableField("end_class_time_")
+    private Date endClassTime;
+    /**
+     * 上课教师
+     */
+    @TableField("teacher_id_")
+    private Integer teacherId;
+    /**
+     * 实际上课教师
+     */
+    @TableField("actual_teacher_id_")
+    private Integer actualTeacherId;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 教学形式（线上、线下）
+     */
+    @TableField("teach_mode_")
+    private String teachMode;
+    /**
+     * 投诉状态
+     */
+    @TableField("complaint_status_")
+    private String complaintStatus;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public CourseSchedule setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public CourseSchedule setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public CourseSchedule setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public BigDecimal getSubsidy() {
+        return subsidy;
+    }
+
+    public CourseSchedule setSubsidy(BigDecimal subsidy) {
+        this.subsidy = subsidy;
+        return this;
+    }
+
+    public Date getClassDate() {
+        return classDate;
+    }
+
+    public CourseSchedule setClassDate(Date classDate) {
+        this.classDate = classDate;
+        return this;
+    }
+
+    public Date getStartClassTime() {
+        return startClassTime;
+    }
+
+    public CourseSchedule setStartClassTime(Date startClassTime) {
+        this.startClassTime = startClassTime;
+        return this;
+    }
+
+    public Date getEndClassTime() {
+        return endClassTime;
+    }
+
+    public CourseSchedule setEndClassTime(Date endClassTime) {
+        this.endClassTime = endClassTime;
+        return this;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public CourseSchedule setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+        return this;
+    }
+
+    public Integer getActualTeacherId() {
+        return actualTeacherId;
+    }
+
+    public CourseSchedule setActualTeacherId(Integer actualTeacherId) {
+        this.actualTeacherId = actualTeacherId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public CourseSchedule setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public CourseSchedule setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getTeachMode() {
+        return teachMode;
+    }
+
+    public CourseSchedule setTeachMode(String teachMode) {
+        this.teachMode = teachMode;
+        return this;
+    }
+
+    public String getComplaintStatus() {
+        return complaintStatus;
+    }
+
+    public CourseSchedule setComplaintStatus(String complaintStatus) {
+        this.complaintStatus = complaintStatus;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CourseSchedule{" +
+        ", id=" + id +
+        ", classGroupId=" + classGroupId +
+        ", status=" + status +
+        ", subsidy=" + subsidy +
+        ", classDate=" + classDate +
+        ", startClassTime=" + startClassTime +
+        ", endClassTime=" + endClassTime +
+        ", teacherId=" + teacherId +
+        ", actualTeacherId=" + actualTeacherId +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", teachMode=" + teachMode +
+        ", complaintStatus=" + complaintStatus +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/CourseScheduleTeacherSalary.java

@@ -0,0 +1,141 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 课程老师薪水表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("course_schedule_teacher_salary")
+public class CourseScheduleTeacherSalary extends Model<CourseScheduleTeacherSalary> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Long id;
+    @TableField("course_schedule_id_")
+    private Long courseScheduleId;
+    /**
+     * 老师角色（主教、助教）
+     */
+    @TableField("teacher_role_")
+    private String teacherRole;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 薪水
+     */
+    @TableField("salary_")
+    private BigDecimal salary;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("create_update_")
+    private Date createUpdate;
+    /**
+     * 补贴
+     */
+    @TableField("subsidy_")
+    private BigDecimal subsidy;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public CourseScheduleTeacherSalary setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public CourseScheduleTeacherSalary setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+        return this;
+    }
+
+    public String getTeacherRole() {
+        return teacherRole;
+    }
+
+    public CourseScheduleTeacherSalary setTeacherRole(String teacherRole) {
+        this.teacherRole = teacherRole;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public CourseScheduleTeacherSalary setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public BigDecimal getSalary() {
+        return salary;
+    }
+
+    public CourseScheduleTeacherSalary setSalary(BigDecimal salary) {
+        this.salary = salary;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public CourseScheduleTeacherSalary setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getCreateUpdate() {
+        return createUpdate;
+    }
+
+    public CourseScheduleTeacherSalary setCreateUpdate(Date createUpdate) {
+        this.createUpdate = createUpdate;
+        return this;
+    }
+
+    public BigDecimal getSubsidy() {
+        return subsidy;
+    }
+
+    public CourseScheduleTeacherSalary setSubsidy(BigDecimal subsidy) {
+        this.subsidy = subsidy;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "CourseScheduleTeacherSalary{" +
+        ", id=" + id +
+        ", courseScheduleId=" + courseScheduleId +
+        ", teacherRole=" + teacherRole +
+        ", userId=" + userId +
+        ", salary=" + salary +
+        ", createTime=" + createTime +
+        ", createUpdate=" + createUpdate +
+        ", subsidy=" + subsidy +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroup.java

@@ -0,0 +1,129 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 试听课
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("demo_group")
+public class DemoGroup extends Model<DemoGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("name_")
+    private String name;
+    /**
+     * 单节课时
+     */
+    @TableField("single_class_minutes_")
+    private Integer singleClassMinutes;
+    /**
+     * 所属分部列表
+     */
+    @TableField("organ_id_list_")
+    private String organIdList;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 老师编号
+     */
+    @TableField("user_id_")
+    private Integer userId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public DemoGroup setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public DemoGroup setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getSingleClassMinutes() {
+        return singleClassMinutes;
+    }
+
+    public DemoGroup setSingleClassMinutes(Integer singleClassMinutes) {
+        this.singleClassMinutes = singleClassMinutes;
+        return this;
+    }
+
+    public String getOrganIdList() {
+        return organIdList;
+    }
+
+    public DemoGroup setOrganIdList(String organIdList) {
+        this.organIdList = organIdList;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DemoGroup setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public DemoGroup setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public DemoGroup setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "DemoGroup{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", singleClassMinutes=" + singleClassMinutes +
+        ", organIdList=" + organIdList +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", userId=" + userId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroupClassGroupMapper.java

@@ -0,0 +1,84 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 试听课与班级关联表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("demo_group_class_group_mapper")
+public class DemoGroupClassGroupMapper extends Model<DemoGroupClassGroupMapper> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("demo_group_id_")
+    private Long demoGroupId;
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    @TableField("create_time_")
+    private Date createTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public DemoGroupClassGroupMapper setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getDemoGroupId() {
+        return demoGroupId;
+    }
+
+    public DemoGroupClassGroupMapper setDemoGroupId(Long demoGroupId) {
+        this.demoGroupId = demoGroupId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public DemoGroupClassGroupMapper setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DemoGroupClassGroupMapper setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "DemoGroupClassGroupMapper{" +
+        ", id=" + id +
+        ", demoGroupId=" + demoGroupId +
+        ", classGroupId=" + classGroupId +
+        ", createTime=" + createTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroupCoursesPlan.java

@@ -0,0 +1,84 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 试听课计划
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("demo_group_courses_plan")
+public class DemoGroupCoursesPlan extends Model<DemoGroupCoursesPlan> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("demo_group_id_")
+    private Long demoGroupId;
+    @TableField("courses_start_time_")
+    private Date coursesStartTime;
+    @TableField("create_time_")
+    private Date createTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public DemoGroupCoursesPlan setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getDemoGroupId() {
+        return demoGroupId;
+    }
+
+    public DemoGroupCoursesPlan setDemoGroupId(Long demoGroupId) {
+        this.demoGroupId = demoGroupId;
+        return this;
+    }
+
+    public Date getCoursesStartTime() {
+        return coursesStartTime;
+    }
+
+    public DemoGroupCoursesPlan setCoursesStartTime(Date coursesStartTime) {
+        this.coursesStartTime = coursesStartTime;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DemoGroupCoursesPlan setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "DemoGroupCoursesPlan{" +
+        ", id=" + id +
+        ", demoGroupId=" + demoGroupId +
+        ", coursesStartTime=" + coursesStartTime +
+        ", createTime=" + createTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/Employee.java

@@ -0,0 +1,233 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 员工表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("employee")
+public class Employee extends Model<Employee> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("user_id_")
+    private Integer userId;
+    @TableField("organ_id_")
+    private Integer organId;
+    /**
+     * 工作性质（兼职、全职、临时）
+     */
+    @TableField("job_nature_")
+    private String jobNature;
+    /**
+     * 是否试用期(1-是 0-否)
+     */
+    @TableField("is_probation_period_")
+    private String isProbationPeriod;
+    /**
+     * 学历
+     */
+    @TableField("education_background_")
+    private String educationBackground;
+    /**
+     * 毕业学校
+     */
+    @TableField("graduate_school_")
+    private String graduateSchool;
+    /**
+     * 技术职称
+     */
+    @TableField("technical_titles_")
+    private String technicalTitles;
+    /**
+     * 入职时间
+     */
+    @TableField("entry_date_")
+    private Date entryDate;
+    /**
+     * 证件类型
+     */
+    @TableField("certificate_type_")
+    private String certificateType;
+    /**
+     * 证件号码
+     */
+    @TableField("certificate_num_")
+    private String certificateNum;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 介绍
+     */
+    @TableField("introduction_")
+    private String introduction;
+    /**
+     * 离职日期
+     */
+    @TableField("demission_date_")
+    private Date demissionDate;
+
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public Employee setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public Employee setOrganId(Integer organId) {
+        this.organId = organId;
+        return this;
+    }
+
+    public String getJobNature() {
+        return jobNature;
+    }
+
+    public Employee setJobNature(String jobNature) {
+        this.jobNature = jobNature;
+        return this;
+    }
+
+    public String getIsProbationPeriod() {
+        return isProbationPeriod;
+    }
+
+    public Employee setIsProbationPeriod(String isProbationPeriod) {
+        this.isProbationPeriod = isProbationPeriod;
+        return this;
+    }
+
+    public String getEducationBackground() {
+        return educationBackground;
+    }
+
+    public Employee setEducationBackground(String educationBackground) {
+        this.educationBackground = educationBackground;
+        return this;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public Employee setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+        return this;
+    }
+
+    public String getTechnicalTitles() {
+        return technicalTitles;
+    }
+
+    public Employee setTechnicalTitles(String technicalTitles) {
+        this.technicalTitles = technicalTitles;
+        return this;
+    }
+
+    public Date getEntryDate() {
+        return entryDate;
+    }
+
+    public Employee setEntryDate(Date entryDate) {
+        this.entryDate = entryDate;
+        return this;
+    }
+
+    public String getCertificateType() {
+        return certificateType;
+    }
+
+    public Employee setCertificateType(String certificateType) {
+        this.certificateType = certificateType;
+        return this;
+    }
+
+    public String getCertificateNum() {
+        return certificateNum;
+    }
+
+    public Employee setCertificateNum(String certificateNum) {
+        this.certificateNum = certificateNum;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public Employee setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public Employee setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public Employee setIntroduction(String introduction) {
+        this.introduction = introduction;
+        return this;
+    }
+
+    public Date getDemissionDate() {
+        return demissionDate;
+    }
+
+    public Employee setDemissionDate(Date demissionDate) {
+        this.demissionDate = demissionDate;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.userId;
+    }
+
+    @Override
+    public String toString() {
+        return "Employee{" +
+        ", userId=" + userId +
+        ", organId=" + organId +
+        ", jobNature=" + jobNature +
+        ", isProbationPeriod=" + isProbationPeriod +
+        ", educationBackground=" + educationBackground +
+        ", graduateSchool=" + graduateSchool +
+        ", technicalTitles=" + technicalTitles +
+        ", entryDate=" + entryDate +
+        ", certificateType=" + certificateType +
+        ", certificateNum=" + certificateNum +
+        ", updateTime=" + updateTime +
+        ", createTime=" + createTime +
+        ", introduction=" + introduction +
+        ", demissionDate=" + demissionDate +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/Goods.java

@@ -0,0 +1,367 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("goods")
+public class Goods extends Model<Goods> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品编号
+     */
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 产品分类
+     */
+    @TableField("goods_category_id_")
+    private Integer goodsCategoryId;
+    /**
+     * 商品货号
+     */
+    @TableField("sn_")
+    private String sn;
+    /**
+     * 商品名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 品牌
+     */
+    @TableField("brand_")
+    private String brand;
+    /**
+     * 规格
+     */
+    @TableField("specification_")
+    private String specification;
+    /**
+     * 展示图片的地址
+     */
+    @TableField("image_")
+    private String image;
+    /**
+     * 库存数量
+     */
+    @TableField("stock_count_")
+    private Integer stockCount;
+    /**
+     * 总销量数
+     */
+    @TableField("sell_count_")
+    private Integer sellCount;
+    /**
+     * 市场销售价
+     */
+    @TableField("market_price_")
+    private BigDecimal marketPrice;
+    /**
+     * 折扣价
+     */
+    @TableField("discount_price_")
+    private BigDecimal discountPrice;
+    /**
+     * 团购价
+     */
+    @TableField("group_purchase_price_")
+    private BigDecimal groupPurchasePrice;
+    /**
+     * 页面简介
+     */
+    @TableField("brief_")
+    private String brief;
+    /**
+     * 商品的详细描述
+     */
+    @TableField("desc_")
+    private String desc;
+    /**
+     * 是否是新品（1，是  0，否）
+     */
+    @TableField("is_new_")
+    private String isNew;
+    /**
+     * 是否置顶（1，置顶   0，不置顶）
+     */
+    @TableField("is_top_")
+    private String isTop;
+    /**
+     * 状态（1，上架  0，下架）
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 备注
+     */
+    @TableField("memo_")
+    private String memo;
+    /**
+     * 发布时间
+     */
+    @TableField("publish_time_")
+    private Date publishTime;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 附件商品列表编号（用逗号分开）
+     */
+    @TableField("complement_goods_id_list_")
+    private String complementGoodsIdList;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Goods setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getGoodsCategoryId() {
+        return goodsCategoryId;
+    }
+
+    public Goods setGoodsCategoryId(Integer goodsCategoryId) {
+        this.goodsCategoryId = goodsCategoryId;
+        return this;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public Goods setSn(String sn) {
+        this.sn = sn;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Goods setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public Goods setBrand(String brand) {
+        this.brand = brand;
+        return this;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public Goods setSpecification(String specification) {
+        this.specification = specification;
+        return this;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public Goods setImage(String image) {
+        this.image = image;
+        return this;
+    }
+
+    public Integer getStockCount() {
+        return stockCount;
+    }
+
+    public Goods setStockCount(Integer stockCount) {
+        this.stockCount = stockCount;
+        return this;
+    }
+
+    public Integer getSellCount() {
+        return sellCount;
+    }
+
+    public Goods setSellCount(Integer sellCount) {
+        this.sellCount = sellCount;
+        return this;
+    }
+
+    public BigDecimal getMarketPrice() {
+        return marketPrice;
+    }
+
+    public Goods setMarketPrice(BigDecimal marketPrice) {
+        this.marketPrice = marketPrice;
+        return this;
+    }
+
+    public BigDecimal getDiscountPrice() {
+        return discountPrice;
+    }
+
+    public Goods setDiscountPrice(BigDecimal discountPrice) {
+        this.discountPrice = discountPrice;
+        return this;
+    }
+
+    public BigDecimal getGroupPurchasePrice() {
+        return groupPurchasePrice;
+    }
+
+    public Goods setGroupPurchasePrice(BigDecimal groupPurchasePrice) {
+        this.groupPurchasePrice = groupPurchasePrice;
+        return this;
+    }
+
+    public String getBrief() {
+        return brief;
+    }
+
+    public Goods setBrief(String brief) {
+        this.brief = brief;
+        return this;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public Goods setDesc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+
+    public String getIsNew() {
+        return isNew;
+    }
+
+    public Goods setIsNew(String isNew) {
+        this.isNew = isNew;
+        return this;
+    }
+
+    public String getIsTop() {
+        return isTop;
+    }
+
+    public Goods setIsTop(String isTop) {
+        this.isTop = isTop;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public Goods setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public Goods setMemo(String memo) {
+        this.memo = memo;
+        return this;
+    }
+
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    public Goods setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public Goods setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public Goods setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getComplementGoodsIdList() {
+        return complementGoodsIdList;
+    }
+
+    public Goods setComplementGoodsIdList(String complementGoodsIdList) {
+        this.complementGoodsIdList = complementGoodsIdList;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Goods{" +
+        ", id=" + id +
+        ", goodsCategoryId=" + goodsCategoryId +
+        ", sn=" + sn +
+        ", name=" + name +
+        ", brand=" + brand +
+        ", specification=" + specification +
+        ", image=" + image +
+        ", stockCount=" + stockCount +
+        ", sellCount=" + sellCount +
+        ", marketPrice=" + marketPrice +
+        ", discountPrice=" + discountPrice +
+        ", groupPurchasePrice=" + groupPurchasePrice +
+        ", brief=" + brief +
+        ", desc=" + desc +
+        ", isNew=" + isNew +
+        ", isTop=" + isTop +
+        ", status=" + status +
+        ", memo=" + memo +
+        ", publishTime=" + publishTime +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", complementGoodsIdList=" + complementGoodsIdList +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/GoodsCategory.java

@@ -0,0 +1,168 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品分类
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("goods_category")
+public class GoodsCategory extends Model<GoodsCategory> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 分类名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 产品展示的图片地址
+     */
+    @TableField("img_")
+    private String img;
+    /**
+     * 父节点编号
+     */
+    @TableField("parent_id_")
+    private Integer parentId;
+    /**
+     * 顺序编号
+     */
+    @TableField("order_no_")
+    private Integer orderNo;
+    /**
+     * 是否删除1是，0否
+     */
+    @TableField("status_")
+    private Boolean status;
+    /**
+     * 描述
+     */
+    @TableField("desc_")
+    private String desc;
+    /**
+     * 最后修改时间
+     */
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public GoodsCategory setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GoodsCategory setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public GoodsCategory setImg(String img) {
+        this.img = img;
+        return this;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public GoodsCategory setParentId(Integer parentId) {
+        this.parentId = parentId;
+        return this;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public GoodsCategory setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public GoodsCategory setStatus(Boolean status) {
+        this.status = status;
+        return this;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public GoodsCategory setDesc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public GoodsCategory setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public GoodsCategory setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsCategory{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", img=" + img +
+        ", parentId=" + parentId +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", desc=" + desc +
+        ", updateTime=" + updateTime +
+        ", createTime=" + createTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/GoodsOrder.java

@@ -0,0 +1,235 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品订单表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("goods_order")
+public class GoodsOrder extends Model<GoodsOrder> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 订单状态
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 订单总额
+     */
+    @TableField("total_amount_")
+    private BigDecimal totalAmount;
+    /**
+     * 优惠金额
+     */
+    @TableField("coupon_amount_")
+    private BigDecimal couponAmount;
+    /**
+     * 商品数量
+     */
+    @TableField("goods_quantity_")
+    private Integer goodsQuantity;
+    /**
+     * 用户备注
+     */
+    @TableField("user_note_")
+    private String userNote;
+    /**
+     * 订单号
+     */
+    @TableField("order_no_")
+    private String orderNo;
+    /**
+     * 订单来源
+     */
+    @TableField("order_source_")
+    private String orderSource;
+    /**
+     * 收货人
+     */
+    @TableField("receiver_id_")
+    private Long receiverId;
+    /**
+     * 快递公司
+     */
+    @TableField("express_company_code_")
+    private String expressCompanyCode;
+    /**
+     * 快递单号
+     */
+    @TableField("express_num_")
+    private String expressNum;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public GoodsOrder setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public GoodsOrder setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public GoodsOrder setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public GoodsOrder setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+        return this;
+    }
+
+    public BigDecimal getCouponAmount() {
+        return couponAmount;
+    }
+
+    public GoodsOrder setCouponAmount(BigDecimal couponAmount) {
+        this.couponAmount = couponAmount;
+        return this;
+    }
+
+    public Integer getGoodsQuantity() {
+        return goodsQuantity;
+    }
+
+    public GoodsOrder setGoodsQuantity(Integer goodsQuantity) {
+        this.goodsQuantity = goodsQuantity;
+        return this;
+    }
+
+    public String getUserNote() {
+        return userNote;
+    }
+
+    public GoodsOrder setUserNote(String userNote) {
+        this.userNote = userNote;
+        return this;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public GoodsOrder setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public String getOrderSource() {
+        return orderSource;
+    }
+
+    public GoodsOrder setOrderSource(String orderSource) {
+        this.orderSource = orderSource;
+        return this;
+    }
+
+    public Long getReceiverId() {
+        return receiverId;
+    }
+
+    public GoodsOrder setReceiverId(Long receiverId) {
+        this.receiverId = receiverId;
+        return this;
+    }
+
+    public String getExpressCompanyCode() {
+        return expressCompanyCode;
+    }
+
+    public GoodsOrder setExpressCompanyCode(String expressCompanyCode) {
+        this.expressCompanyCode = expressCompanyCode;
+        return this;
+    }
+
+    public String getExpressNum() {
+        return expressNum;
+    }
+
+    public GoodsOrder setExpressNum(String expressNum) {
+        this.expressNum = expressNum;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public GoodsOrder setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public GoodsOrder setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsOrder{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", status=" + status +
+        ", totalAmount=" + totalAmount +
+        ", couponAmount=" + couponAmount +
+        ", goodsQuantity=" + goodsQuantity +
+        ", userNote=" + userNote +
+        ", orderNo=" + orderNo +
+        ", orderSource=" + orderSource +
+        ", receiverId=" + receiverId +
+        ", expressCompanyCode=" + expressCompanyCode +
+        ", expressNum=" + expressNum +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/GoodsOrderItem.java

@@ -0,0 +1,142 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品订单项
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("goods_order_item")
+public class GoodsOrderItem extends Model<GoodsOrderItem> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("goods_order_id_")
+    private Long goodsOrderId;
+    @TableField("goods_id_")
+    private Integer goodsId;
+    /**
+     * 市场价
+     */
+    @TableField("market_price_")
+    private BigDecimal marketPrice;
+    /**
+     * 折扣价
+     */
+    @TableField("discount_price_")
+    private BigDecimal discountPrice;
+    /**
+     * 商品数量
+     */
+    @TableField("goods_quantity_")
+    private Integer goodsQuantity;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public GoodsOrderItem setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getGoodsOrderId() {
+        return goodsOrderId;
+    }
+
+    public GoodsOrderItem setGoodsOrderId(Long goodsOrderId) {
+        this.goodsOrderId = goodsOrderId;
+        return this;
+    }
+
+    public Integer getGoodsId() {
+        return goodsId;
+    }
+
+    public GoodsOrderItem setGoodsId(Integer goodsId) {
+        this.goodsId = goodsId;
+        return this;
+    }
+
+    public BigDecimal getMarketPrice() {
+        return marketPrice;
+    }
+
+    public GoodsOrderItem setMarketPrice(BigDecimal marketPrice) {
+        this.marketPrice = marketPrice;
+        return this;
+    }
+
+    public BigDecimal getDiscountPrice() {
+        return discountPrice;
+    }
+
+    public GoodsOrderItem setDiscountPrice(BigDecimal discountPrice) {
+        this.discountPrice = discountPrice;
+        return this;
+    }
+
+    public Integer getGoodsQuantity() {
+        return goodsQuantity;
+    }
+
+    public GoodsOrderItem setGoodsQuantity(Integer goodsQuantity) {
+        this.goodsQuantity = goodsQuantity;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public GoodsOrderItem setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public GoodsOrderItem setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsOrderItem{" +
+        ", id=" + id +
+        ", goodsOrderId=" + goodsOrderId +
+        ", goodsId=" + goodsId +
+        ", marketPrice=" + marketPrice +
+        ", discountPrice=" + discountPrice +
+        ", goodsQuantity=" + goodsQuantity +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/GoodsOrderPayment.java

@@ -0,0 +1,232 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品订单支付表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("goods_order_payment")
+public class GoodsOrderPayment extends Model<GoodsOrderPayment> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("user_id_")
+    private Integer userId;
+    @TableField("goods_order_id_")
+    private Long goodsOrderId;
+    /**
+     * 支付渠道
+     */
+    @TableField("payment_channel_")
+    private String paymentChannel;
+    /**
+     * 业务渠道
+     */
+    @TableField("payment_business_channel_")
+    private String paymentBusinessChannel;
+    /**
+     * 支付账号
+     */
+    @TableField("payment_account_no_")
+    private String paymentAccountNo;
+    /**
+     * 支付金额
+     */
+    @TableField("amount_")
+    private BigDecimal amount;
+    /**
+     * 交易流水号
+     */
+    @TableField("trans_no_")
+    private String transNo;
+    /**
+     * 订单号
+     */
+    @TableField("order_no_")
+    private String orderNo;
+    /**
+     * 支付状态
+     */
+    @TableField("pay_status_")
+    private String payStatus;
+    /**
+     * 到账时间
+     */
+    @TableField("arrival_time_")
+    private Date arrivalTime;
+    /**
+     * 备注
+     */
+    @TableField("remark_")
+    private String remark;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public GoodsOrderPayment setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public GoodsOrderPayment setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Long getGoodsOrderId() {
+        return goodsOrderId;
+    }
+
+    public GoodsOrderPayment setGoodsOrderId(Long goodsOrderId) {
+        this.goodsOrderId = goodsOrderId;
+        return this;
+    }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public GoodsOrderPayment setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+        return this;
+    }
+
+    public String getPaymentBusinessChannel() {
+        return paymentBusinessChannel;
+    }
+
+    public GoodsOrderPayment setPaymentBusinessChannel(String paymentBusinessChannel) {
+        this.paymentBusinessChannel = paymentBusinessChannel;
+        return this;
+    }
+
+    public String getPaymentAccountNo() {
+        return paymentAccountNo;
+    }
+
+    public GoodsOrderPayment setPaymentAccountNo(String paymentAccountNo) {
+        this.paymentAccountNo = paymentAccountNo;
+        return this;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public GoodsOrderPayment setAmount(BigDecimal amount) {
+        this.amount = amount;
+        return this;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public GoodsOrderPayment setTransNo(String transNo) {
+        this.transNo = transNo;
+        return this;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public GoodsOrderPayment setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public GoodsOrderPayment setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+        return this;
+    }
+
+    public Date getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public GoodsOrderPayment setArrivalTime(Date arrivalTime) {
+        this.arrivalTime = arrivalTime;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public GoodsOrderPayment setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public GoodsOrderPayment setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public GoodsOrderPayment setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsOrderPayment{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", goodsOrderId=" + goodsOrderId +
+        ", paymentChannel=" + paymentChannel +
+        ", paymentBusinessChannel=" + paymentBusinessChannel +
+        ", paymentAccountNo=" + paymentAccountNo +
+        ", amount=" + amount +
+        ", transNo=" + transNo +
+        ", orderNo=" + orderNo +
+        ", payStatus=" + payStatus +
+        ", arrivalTime=" + arrivalTime +
+        ", remark=" + remark +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/HotWordsLabel.java

@@ -0,0 +1,95 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 热词标签管理
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("hot_words_label")
+public class HotWordsLabel extends Model<HotWordsLabel> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Integer id;
+    @TableField("name_")
+    private String name;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("del_flag_")
+    private String delFlag;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public HotWordsLabel setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public HotWordsLabel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public HotWordsLabel setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public HotWordsLabel setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public HotWordsLabel setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "HotWordsLabel{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", delFlag=" + delFlag +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/LeaveCategory.java

@@ -0,0 +1,113 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 请假类别表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("leave_category")
+public class LeaveCategory extends Model<LeaveCategory> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Integer id;
+    /**
+     * 类型名称
+     */
+    @TableField("name_")
+    private String name;
+    @TableField("del_flag_")
+    private String delFlag;
+    /**
+     * 备注
+     */
+    @TableField("remark_")
+    private String remark;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public LeaveCategory setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LeaveCategory setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public LeaveCategory setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public LeaveCategory setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public LeaveCategory setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public LeaveCategory setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "LeaveCategory{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", delFlag=" + delFlag +
+        ", remark=" + remark +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroup.java

@@ -0,0 +1,326 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 乐团表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group")
+public class MusicGroup extends Model<MusicGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private String id;
+    /**
+     * 乐团名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 所属分部
+     */
+    @TableField("organ_id_")
+    private Integer organId;
+    /**
+     * 学校(合作单位)
+     */
+    @TableField("school_id_")
+    private Integer schoolId;
+    /**
+     * 报名截止日期
+     */
+    @TableField("apply_expire_date_")
+    private Date applyExpireDate;
+    /**
+     * 运营主管
+     */
+    @TableField("team_teacher_id_")
+    private Integer teamTeacherId;
+    /**
+     * 教务老师
+     */
+    @TableField("educational_teacher_id_")
+    private Integer educationalTeacherId;
+    /**
+     * 收费类型
+     */
+    @TableField("charge_type_id_")
+    private Integer chargeTypeId;
+    /**
+     * 课程形态
+     */
+    @TableField("course_form_")
+    private String courseForm;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 状态（报名中、缴费中、筹备中、进行中、取消）
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 计费开始日期
+     */
+    @TableField("bill_start_date_")
+    private Date billStartDate;
+    /**
+     * 提高课班级数
+     */
+    @TableField("improvent_classes_num_")
+    private Integer improventClassesNum;
+    /**
+     * 招生年级（多个用|分开）
+     */
+    @TableField("enroll_classes_")
+    private String enrollClasses;
+    /**
+     * 缴费截止时间
+     */
+    @TableField("payment_expire_date_")
+    private Date paymentExpireDate;
+    /**
+     * 是否是加课
+     */
+    @TableField("is_extra_class_")
+    private String isExtraClass;
+    /**
+     * 合作单位编号
+     */
+    @TableField("cooperation_organ_id_")
+    private Integer cooperationOrganId;
+    /**
+     * 启蒙课日期
+     */
+    @TableField("enlightenment_course_time_")
+    private Date enlightenmentCourseTime;
+    /**
+     * 家长会日期
+     */
+    @TableField("parent_meeting_time_")
+    private Date parentMeetingTime;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public MusicGroup setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public MusicGroup setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public MusicGroup setOrganId(Integer organId) {
+        this.organId = organId;
+        return this;
+    }
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public MusicGroup setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+        return this;
+    }
+
+    public Date getApplyExpireDate() {
+        return applyExpireDate;
+    }
+
+    public MusicGroup setApplyExpireDate(Date applyExpireDate) {
+        this.applyExpireDate = applyExpireDate;
+        return this;
+    }
+
+    public Integer getTeamTeacherId() {
+        return teamTeacherId;
+    }
+
+    public MusicGroup setTeamTeacherId(Integer teamTeacherId) {
+        this.teamTeacherId = teamTeacherId;
+        return this;
+    }
+
+    public Integer getEducationalTeacherId() {
+        return educationalTeacherId;
+    }
+
+    public MusicGroup setEducationalTeacherId(Integer educationalTeacherId) {
+        this.educationalTeacherId = educationalTeacherId;
+        return this;
+    }
+
+    public Integer getChargeTypeId() {
+        return chargeTypeId;
+    }
+
+    public MusicGroup setChargeTypeId(Integer chargeTypeId) {
+        this.chargeTypeId = chargeTypeId;
+        return this;
+    }
+
+    public String getCourseForm() {
+        return courseForm;
+    }
+
+    public MusicGroup setCourseForm(String courseForm) {
+        this.courseForm = courseForm;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroup setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroup setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public MusicGroup setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getBillStartDate() {
+        return billStartDate;
+    }
+
+    public MusicGroup setBillStartDate(Date billStartDate) {
+        this.billStartDate = billStartDate;
+        return this;
+    }
+
+    public Integer getImproventClassesNum() {
+        return improventClassesNum;
+    }
+
+    public MusicGroup setImproventClassesNum(Integer improventClassesNum) {
+        this.improventClassesNum = improventClassesNum;
+        return this;
+    }
+
+    public String getEnrollClasses() {
+        return enrollClasses;
+    }
+
+    public MusicGroup setEnrollClasses(String enrollClasses) {
+        this.enrollClasses = enrollClasses;
+        return this;
+    }
+
+    public Date getPaymentExpireDate() {
+        return paymentExpireDate;
+    }
+
+    public MusicGroup setPaymentExpireDate(Date paymentExpireDate) {
+        this.paymentExpireDate = paymentExpireDate;
+        return this;
+    }
+
+    public String getIsExtraClass() {
+        return isExtraClass;
+    }
+
+    public MusicGroup setIsExtraClass(String isExtraClass) {
+        this.isExtraClass = isExtraClass;
+        return this;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public MusicGroup setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+        return this;
+    }
+
+    public Date getEnlightenmentCourseTime() {
+        return enlightenmentCourseTime;
+    }
+
+    public MusicGroup setEnlightenmentCourseTime(Date enlightenmentCourseTime) {
+        this.enlightenmentCourseTime = enlightenmentCourseTime;
+        return this;
+    }
+
+    public Date getParentMeetingTime() {
+        return parentMeetingTime;
+    }
+
+    public MusicGroup setParentMeetingTime(Date parentMeetingTime) {
+        this.parentMeetingTime = parentMeetingTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroup{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", organId=" + organId +
+        ", schoolId=" + schoolId +
+        ", applyExpireDate=" + applyExpireDate +
+        ", teamTeacherId=" + teamTeacherId +
+        ", educationalTeacherId=" + educationalTeacherId +
+        ", chargeTypeId=" + chargeTypeId +
+        ", courseForm=" + courseForm +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", status=" + status +
+        ", billStartDate=" + billStartDate +
+        ", improventClassesNum=" + improventClassesNum +
+        ", enrollClasses=" + enrollClasses +
+        ", paymentExpireDate=" + paymentExpireDate +
+        ", isExtraClass=" + isExtraClass +
+        ", cooperationOrganId=" + cooperationOrganId +
+        ", enlightenmentCourseTime=" + enlightenmentCourseTime +
+        ", parentMeetingTime=" + parentMeetingTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupBuildLog.java

@@ -0,0 +1,110 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 建团日志表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_build_log")
+public class MusicGroupBuildLog extends Model<MusicGroupBuildLog> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Integer id;
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    /**
+     * 事件
+     */
+    @TableField("event_")
+    private String event;
+    @TableField("operator_")
+    private Integer operator;
+    @TableField("memo_")
+    private String memo;
+    @TableField("create_time_")
+    private Date createTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public MusicGroupBuildLog setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupBuildLog setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public String getEvent() {
+        return event;
+    }
+
+    public MusicGroupBuildLog setEvent(String event) {
+        this.event = event;
+        return this;
+    }
+
+    public Integer getOperator() {
+        return operator;
+    }
+
+    public MusicGroupBuildLog setOperator(Integer operator) {
+        this.operator = operator;
+        return this;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public MusicGroupBuildLog setMemo(String memo) {
+        this.memo = memo;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupBuildLog setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupBuildLog{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", event=" + event +
+        ", operator=" + operator +
+        ", memo=" + memo +
+        ", createTime=" + createTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupPaymentCalender.java

@@ -0,0 +1,114 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 乐团缴费日历
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_payment_calender")
+public class MusicGroupPaymentCalender extends Model<MusicGroupPaymentCalender> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("music_group_id_")
+    private String musicGroupId;
+    /**
+     * 缴费月份
+     */
+    @TableField("payment_month_")
+    private Integer paymentMonth;
+    /**
+     * 开始缴费日期
+     */
+    @TableField("start_payment_date_")
+    private Date startPaymentDate;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public MusicGroupPaymentCalender setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupPaymentCalender setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getPaymentMonth() {
+        return paymentMonth;
+    }
+
+    public MusicGroupPaymentCalender setPaymentMonth(Integer paymentMonth) {
+        this.paymentMonth = paymentMonth;
+        return this;
+    }
+
+    public Date getStartPaymentDate() {
+        return startPaymentDate;
+    }
+
+    public MusicGroupPaymentCalender setStartPaymentDate(Date startPaymentDate) {
+        this.startPaymentDate = startPaymentDate;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupPaymentCalender setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroupPaymentCalender setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupPaymentCalender{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", paymentMonth=" + paymentMonth +
+        ", startPaymentDate=" + startPaymentDate +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupPaymentEntities.java

@@ -0,0 +1,148 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 乐团付费主体
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_payment_entities")
+public class MusicGroupPaymentEntities extends Model<MusicGroupPaymentEntities> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 乐团编号
+     */
+    @TableField("music_group_id_")
+    private String musicGroupId;
+    /**
+     * 主体名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 付费方式(一次性、按月、按学期、按学年)
+     */
+    @TableField("payment_method_")
+    private String paymentMethod;
+    /**
+     * 金额
+     */
+    @TableField("amount_")
+    private BigDecimal amount;
+    /**
+     * 备注
+     */
+    @TableField("memo_")
+    private String memo;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public MusicGroupPaymentEntities setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupPaymentEntities setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public MusicGroupPaymentEntities setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public MusicGroupPaymentEntities setPaymentMethod(String paymentMethod) {
+        this.paymentMethod = paymentMethod;
+        return this;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public MusicGroupPaymentEntities setAmount(BigDecimal amount) {
+        this.amount = amount;
+        return this;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public MusicGroupPaymentEntities setMemo(String memo) {
+        this.memo = memo;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupPaymentEntities setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroupPaymentEntities setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupPaymentEntities{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", name=" + name +
+        ", paymentMethod=" + paymentMethod +
+        ", amount=" + amount +
+        ", memo=" + memo +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupPurchaseList.java

@@ -0,0 +1,111 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 乐团采购清单
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_purchase_list")
+public class MusicGroupPurchaseList extends Model<MusicGroupPurchaseList> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    @TableField("music_group_id_")
+    private String musicGroupId;
+    @TableField("goods_id_")
+    private Integer goodsId;
+    /**
+     * 采购数量
+     */
+    @TableField("purchase_num_")
+    private Integer purchaseNum;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public MusicGroupPurchaseList setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupPurchaseList setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getGoodsId() {
+        return goodsId;
+    }
+
+    public MusicGroupPurchaseList setGoodsId(Integer goodsId) {
+        this.goodsId = goodsId;
+        return this;
+    }
+
+    public Integer getPurchaseNum() {
+        return purchaseNum;
+    }
+
+    public MusicGroupPurchaseList setPurchaseNum(Integer purchaseNum) {
+        this.purchaseNum = purchaseNum;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupPurchaseList setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroupPurchaseList setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupPurchaseList{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", goodsId=" + goodsId +
+        ", purchaseNum=" + purchaseNum +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupStudentFee.java

@@ -0,0 +1,112 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 乐团学生费用表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_student_fee_")
+public class MusicGroupStudentFee extends Model<MusicGroupStudentFee> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 课程费用
+     */
+    @TableField("course_fee_")
+    private BigDecimal courseFee;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public MusicGroupStudentFee setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupStudentFee setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public MusicGroupStudentFee setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public BigDecimal getCourseFee() {
+        return courseFee;
+    }
+
+    public MusicGroupStudentFee setCourseFee(BigDecimal courseFee) {
+        this.courseFee = courseFee;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupStudentFee setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroupStudentFee setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupStudentFee{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", userId=" + userId +
+        ", courseFee=" + courseFee +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupSubjectGoodsGroup.java

@@ -0,0 +1,172 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品分组表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_subject_goods_group")
+public class MusicGroupSubjectGoodsGroup extends Model<MusicGroupSubjectGoodsGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 类型(乐器、教辅)
+     */
+    @TableField("type_")
+    private String type;
+    @TableField("music_group_id_")
+    private String musicGroupId;
+    @TableField("subject_id_")
+    private Integer subjectId;
+    /**
+     * 商品列表(用逗号分隔分开)
+     */
+    @TableField("goods_id_list_")
+    private String goodsIdList;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 打包价格
+     */
+    @TableField("price_")
+    private BigDecimal price;
+    /**
+     * 减免课程费用
+     */
+    @TableField("remission_course_fee_")
+    private BigDecimal remissionCourseFee;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public MusicGroupSubjectGoodsGroup setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public MusicGroupSubjectGoodsGroup setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public MusicGroupSubjectGoodsGroup setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupSubjectGoodsGroup setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public MusicGroupSubjectGoodsGroup setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    public String getGoodsIdList() {
+        return goodsIdList;
+    }
+
+    public MusicGroupSubjectGoodsGroup setGoodsIdList(String goodsIdList) {
+        this.goodsIdList = goodsIdList;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupSubjectGoodsGroup setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroupSubjectGoodsGroup setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public MusicGroupSubjectGoodsGroup setPrice(BigDecimal price) {
+        this.price = price;
+        return this;
+    }
+
+    public BigDecimal getRemissionCourseFee() {
+        return remissionCourseFee;
+    }
+
+    public MusicGroupSubjectGoodsGroup setRemissionCourseFee(BigDecimal remissionCourseFee) {
+        this.remissionCourseFee = remissionCourseFee;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupSubjectGoodsGroup{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", type=" + type +
+        ", musicGroupId=" + musicGroupId +
+        ", subjectId=" + subjectId +
+        ", goodsIdList=" + goodsIdList +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", price=" + price +
+        ", remissionCourseFee=" + remissionCourseFee +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupSubjectPlan.java

@@ -0,0 +1,178 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 乐团科目规划表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("music_group_subject_plan")
+public class MusicGroupSubjectPlan extends Model<MusicGroupSubjectPlan> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 乐团编号
+     */
+    @TableField("music_group_id_")
+    private String musicGroupId;
+    /**
+     * 科目编号
+     */
+    @TableField("subject_id_")
+    private Integer subjectId;
+    /**
+     * 预计学生数
+     */
+    @TableField("expected_student_num_")
+    private Integer expectedStudentNum;
+    /**
+     * 报名学生数
+     */
+    @TableField("apply_student_num_")
+    private Integer applyStudentNum;
+    /**
+     * 费用
+     */
+    @TableField("fee_")
+    private BigDecimal fee;
+    /**
+     * 乐器团购类型（自备、赠送、租赁、团购）
+     */
+    @TableField("kit_group_purchase_type_")
+    private String kitGroupPurchaseType;
+    /**
+     * 保证金（只有租赁才有）
+     */
+    @TableField("deposit_fee_")
+    private BigDecimal depositFee;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public MusicGroupSubjectPlan setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public MusicGroupSubjectPlan setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public MusicGroupSubjectPlan setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    public Integer getExpectedStudentNum() {
+        return expectedStudentNum;
+    }
+
+    public MusicGroupSubjectPlan setExpectedStudentNum(Integer expectedStudentNum) {
+        this.expectedStudentNum = expectedStudentNum;
+        return this;
+    }
+
+    public Integer getApplyStudentNum() {
+        return applyStudentNum;
+    }
+
+    public MusicGroupSubjectPlan setApplyStudentNum(Integer applyStudentNum) {
+        this.applyStudentNum = applyStudentNum;
+        return this;
+    }
+
+    public BigDecimal getFee() {
+        return fee;
+    }
+
+    public MusicGroupSubjectPlan setFee(BigDecimal fee) {
+        this.fee = fee;
+        return this;
+    }
+
+    public String getKitGroupPurchaseType() {
+        return kitGroupPurchaseType;
+    }
+
+    public MusicGroupSubjectPlan setKitGroupPurchaseType(String kitGroupPurchaseType) {
+        this.kitGroupPurchaseType = kitGroupPurchaseType;
+        return this;
+    }
+
+    public BigDecimal getDepositFee() {
+        return depositFee;
+    }
+
+    public MusicGroupSubjectPlan setDepositFee(BigDecimal depositFee) {
+        this.depositFee = depositFee;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public MusicGroupSubjectPlan setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public MusicGroupSubjectPlan setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MusicGroupSubjectPlan{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", subjectId=" + subjectId +
+        ", expectedStudentNum=" + expectedStudentNum +
+        ", applyStudentNum=" + applyStudentNum +
+        ", fee=" + fee +
+        ", kitGroupPurchaseType=" + kitGroupPurchaseType +
+        ", depositFee=" + depositFee +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/Organization.java

@@ -0,0 +1,183 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 组织机构
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("organization")
+public class Organization extends Model<Organization> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 机构名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 机构编码
+     */
+    @TableField("area_id_")
+    private Integer areaId;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 是否删除  -1：已删除  0：正常
+     */
+    @TableField("del_flag_")
+    private String delFlag;
+    /**
+     * 成立日期
+     */
+    @TableField("register_date_")
+    private Date registerDate;
+    /**
+     * 联系人
+     */
+    @TableField("linkman_")
+    private String linkman;
+    /**
+     * 联系方式
+     */
+    @TableField("mobile_")
+    private String mobile;
+    /**
+     * 地址
+     */
+    @TableField("address_")
+    private String address;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Organization setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Organization setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getAreaId() {
+        return areaId;
+    }
+
+    public Organization setAreaId(Integer areaId) {
+        this.areaId = areaId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public Organization setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public Organization setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public Organization setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public Date getRegisterDate() {
+        return registerDate;
+    }
+
+    public Organization setRegisterDate(Date registerDate) {
+        this.registerDate = registerDate;
+        return this;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public Organization setLinkman(String linkman) {
+        this.linkman = linkman;
+        return this;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public Organization setMobile(String mobile) {
+        this.mobile = mobile;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public Organization setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Organization{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", areaId=" + areaId +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", delFlag=" + delFlag +
+        ", registerDate=" + registerDate +
+        ", linkman=" + linkman +
+        ", mobile=" + mobile +
+        ", address=" + address +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/RongyunRoom.java

@@ -0,0 +1,119 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("rongyun_room")
+public class RongyunRoom extends Model<RongyunRoom> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    private String rid;
+    private String name;
+    private String portrait;
+    @TableField("create_dt")
+    private Date createDt;
+    /**
+     * the current display: teacher, assistant, whiteboard, screen
+     */
+    private String display;
+    @TableField("whiteboard_name_index")
+    private Integer whiteboardNameIndex;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public RongyunRoom setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getRid() {
+        return rid;
+    }
+
+    public RongyunRoom setRid(String rid) {
+        this.rid = rid;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public RongyunRoom setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getPortrait() {
+        return portrait;
+    }
+
+    public RongyunRoom setPortrait(String portrait) {
+        this.portrait = portrait;
+        return this;
+    }
+
+    public Date getCreateDt() {
+        return createDt;
+    }
+
+    public RongyunRoom setCreateDt(Date createDt) {
+        this.createDt = createDt;
+        return this;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public RongyunRoom setDisplay(String display) {
+        this.display = display;
+        return this;
+    }
+
+    public Integer getWhiteboardNameIndex() {
+        return whiteboardNameIndex;
+    }
+
+    public RongyunRoom setWhiteboardNameIndex(Integer whiteboardNameIndex) {
+        this.whiteboardNameIndex = whiteboardNameIndex;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "RongyunRoom{" +
+        ", id=" + id +
+        ", rid=" + rid +
+        ", name=" + name +
+        ", portrait=" + portrait +
+        ", createDt=" + createDt +
+        ", display=" + display +
+        ", whiteboardNameIndex=" + whiteboardNameIndex +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/RongyunRoomMember.java

@@ -0,0 +1,132 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("rongyun_room_member")
+public class RongyunRoomMember extends Model<RongyunRoomMember> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * room id
+     */
+    private String rid;
+    /**
+     * user id
+     */
+    private String uid;
+    @TableField("join_dt")
+    private Date joinDt;
+    private Integer role;
+    private String name;
+    private Integer camera;
+    private Integer mic;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public RongyunRoomMember setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getRid() {
+        return rid;
+    }
+
+    public RongyunRoomMember setRid(String rid) {
+        this.rid = rid;
+        return this;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public RongyunRoomMember setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public Date getJoinDt() {
+        return joinDt;
+    }
+
+    public RongyunRoomMember setJoinDt(Date joinDt) {
+        this.joinDt = joinDt;
+        return this;
+    }
+
+    public Integer getRole() {
+        return role;
+    }
+
+    public RongyunRoomMember setRole(Integer role) {
+        this.role = role;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public RongyunRoomMember setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getCamera() {
+        return camera;
+    }
+
+    public RongyunRoomMember setCamera(Integer camera) {
+        this.camera = camera;
+        return this;
+    }
+
+    public Integer getMic() {
+        return mic;
+    }
+
+    public RongyunRoomMember setMic(Integer mic) {
+        this.mic = mic;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "RongyunRoomMember{" +
+        ", id=" + id +
+        ", rid=" + rid +
+        ", uid=" + uid +
+        ", joinDt=" + joinDt +
+        ", role=" + role +
+        ", name=" + name +
+        ", camera=" + camera +
+        ", mic=" + mic +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/RongyunUser.java

@@ -0,0 +1,105 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("rongyun_user")
+public class RongyunUser extends Model<RongyunUser> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    private String uid;
+    private String name;
+    private String portrait;
+    @TableField("create_dt")
+    private Date createDt;
+    @TableField("update_dt")
+    private Date updateDt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public RongyunUser setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public RongyunUser setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public RongyunUser setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getPortrait() {
+        return portrait;
+    }
+
+    public RongyunUser setPortrait(String portrait) {
+        this.portrait = portrait;
+        return this;
+    }
+
+    public Date getCreateDt() {
+        return createDt;
+    }
+
+    public RongyunUser setCreateDt(Date createDt) {
+        this.createDt = createDt;
+        return this;
+    }
+
+    public Date getUpdateDt() {
+        return updateDt;
+    }
+
+    public RongyunUser setUpdateDt(Date updateDt) {
+        this.updateDt = updateDt;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "RongyunUser{" +
+        ", id=" + id +
+        ", uid=" + uid +
+        ", name=" + name +
+        ", portrait=" + portrait +
+        ", createDt=" + createDt +
+        ", updateDt=" + updateDt +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/RongyunWhiteboard.java

@@ -0,0 +1,155 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("rongyun_whiteboard")
+public class RongyunWhiteboard extends Model<RongyunWhiteboard> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * room id
+     */
+    private String rid;
+    /**
+     * whiteboard room
+     */
+    @TableField("wb_room")
+    private String wbRoom;
+    /**
+     * displayer uri
+     */
+    private String wbid;
+    private String name;
+    private String creator;
+    /**
+     * 总页数
+     */
+    @TableField("pg_count")
+    private Integer pgCount;
+    /**
+     * 当前页
+     */
+    @TableField("cur_pg")
+    private Integer curPg;
+    @TableField("create_dt")
+    private Date createDt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public RongyunWhiteboard setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getRid() {
+        return rid;
+    }
+
+    public RongyunWhiteboard setRid(String rid) {
+        this.rid = rid;
+        return this;
+    }
+
+    public String getWbRoom() {
+        return wbRoom;
+    }
+
+    public RongyunWhiteboard setWbRoom(String wbRoom) {
+        this.wbRoom = wbRoom;
+        return this;
+    }
+
+    public String getWbid() {
+        return wbid;
+    }
+
+    public RongyunWhiteboard setWbid(String wbid) {
+        this.wbid = wbid;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public RongyunWhiteboard setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public RongyunWhiteboard setCreator(String creator) {
+        this.creator = creator;
+        return this;
+    }
+
+    public Integer getPgCount() {
+        return pgCount;
+    }
+
+    public RongyunWhiteboard setPgCount(Integer pgCount) {
+        this.pgCount = pgCount;
+        return this;
+    }
+
+    public Integer getCurPg() {
+        return curPg;
+    }
+
+    public RongyunWhiteboard setCurPg(Integer curPg) {
+        this.curPg = curPg;
+        return this;
+    }
+
+    public Date getCreateDt() {
+        return createDt;
+    }
+
+    public RongyunWhiteboard setCreateDt(Date createDt) {
+        this.createDt = createDt;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "RongyunWhiteboard{" +
+        ", id=" + id +
+        ", rid=" + rid +
+        ", wbRoom=" + wbRoom +
+        ", wbid=" + wbid +
+        ", name=" + name +
+        ", creator=" + creator +
+        ", pgCount=" + pgCount +
+        ", curPg=" + curPg +
+        ", createDt=" + createDt +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/School.java

@@ -0,0 +1,205 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 教学点
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("school")
+public class School extends Model<School> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    @TableField("name_")
+    private String name;
+    @TableField("organ_id_")
+    private Integer organId;
+    @TableField("address_")
+    private String address;
+    @TableField("contact_phone_")
+    private String contactPhone;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("del_flag_")
+    private Integer delFlag;
+    /**
+     * 联系人
+     */
+    @TableField("contact_name_")
+    private String contactName;
+    /**
+     * 经纬度
+     */
+    @TableField("longitude_latitude_")
+    private String longitudeLatitude;
+    /**
+     * 补贴
+     */
+    @TableField("subsidy_")
+    private BigDecimal subsidy;
+    /**
+     * 合作机构编号
+     */
+    @TableField("cooperation_organ_id_")
+    private Integer cooperationOrganId;
+    @TableField("remark_")
+    private String remark;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public School setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public School setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public School setOrganId(Integer organId) {
+        this.organId = organId;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public School setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public School setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public School setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public School setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public School setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public School setContactName(String contactName) {
+        this.contactName = contactName;
+        return this;
+    }
+
+    public String getLongitudeLatitude() {
+        return longitudeLatitude;
+    }
+
+    public School setLongitudeLatitude(String longitudeLatitude) {
+        this.longitudeLatitude = longitudeLatitude;
+        return this;
+    }
+
+    public BigDecimal getSubsidy() {
+        return subsidy;
+    }
+
+    public School setSubsidy(BigDecimal subsidy) {
+        this.subsidy = subsidy;
+        return this;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public School setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public School setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "School{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", organId=" + organId +
+        ", address=" + address +
+        ", contactPhone=" + contactPhone +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", delFlag=" + delFlag +
+        ", contactName=" + contactName +
+        ", longitudeLatitude=" + longitudeLatitude +
+        ", subsidy=" + subsidy +
+        ", cooperationOrganId=" + cooperationOrganId +
+        ", remark=" + remark +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentApplyRefunds.java

@@ -0,0 +1,160 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生申请退费表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_apply_refunds")
+public class StudentApplyRefunds extends Model<StudentApplyRefunds> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 订单号
+     */
+    @TableField("order_no_")
+    private String orderNo;
+    /**
+     * 状态(1,交易中;2,成功交易;-1,交易失败;)
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 预计退费金额
+     */
+    @TableField("expect_amount_")
+    private BigDecimal expectAmount;
+    /**
+     * 实际退费金额
+     */
+    @TableField("actual_amount_")
+    private BigDecimal actualAmount;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 原订单编号
+     */
+    @TableField("orig_payment_order_id_")
+    private Long origPaymentOrderId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentApplyRefunds setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public StudentApplyRefunds setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public StudentApplyRefunds setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public StudentApplyRefunds setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public BigDecimal getExpectAmount() {
+        return expectAmount;
+    }
+
+    public StudentApplyRefunds setExpectAmount(BigDecimal expectAmount) {
+        this.expectAmount = expectAmount;
+        return this;
+    }
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public StudentApplyRefunds setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentApplyRefunds setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public StudentApplyRefunds setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Long getOrigPaymentOrderId() {
+        return origPaymentOrderId;
+    }
+
+    public StudentApplyRefunds setOrigPaymentOrderId(Long origPaymentOrderId) {
+        this.origPaymentOrderId = origPaymentOrderId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentApplyRefunds{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", expectAmount=" + expectAmount +
+        ", actualAmount=" + actualAmount +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", origPaymentOrderId=" + origPaymentOrderId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentAttendance.java

@@ -0,0 +1,162 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生考勤表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_attendance")
+public class StudentAttendance extends Model<StudentAttendance> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 乐团
+     */
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    /**
+     * 班级
+     */
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+    /**
+     * 课程计划
+     */
+    @TableField("course_schedule_id_")
+    private Long courseScheduleId;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 点名的教师
+     */
+    @TableField("teacher_id_")
+    private Integer teacherId;
+    /**
+     * 状态（正常、旷课、请假、休学）
+     */
+    @TableField("status_")
+    private String status;
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 如果是请假状态，此字段就指请假原因
+     */
+    @TableField("remark_")
+    private String remark;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentAttendance setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public StudentAttendance setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public StudentAttendance setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public StudentAttendance setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public StudentAttendance setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public StudentAttendance setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public StudentAttendance setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentAttendance setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public StudentAttendance setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentAttendance{" +
+        ", id=" + id +
+        ", musicGroupId=" + musicGroupId +
+        ", classGroupId=" + classGroupId +
+        ", courseScheduleId=" + courseScheduleId +
+        ", userId=" + userId +
+        ", teacherId=" + teacherId +
+        ", status=" + status +
+        ", createTime=" + createTime +
+        ", remark=" + remark +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentCourseHomework.java

@@ -0,0 +1,171 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生课程作业
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_course_homework")
+public class StudentCourseHomework extends Model<StudentCourseHomework> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("course_homework_id_")
+    private Long courseHomeworkId;
+    /**
+     * 作品附件
+     */
+    @TableField("attachments_")
+    private String attachments;
+    /**
+     * 评分
+     */
+    @TableField("score_")
+    private Integer score;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 备注
+     */
+    @TableField("remark_")
+    private String remark;
+    /**
+     * 提交状态
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 是否回复
+     */
+    @TableField("is_replied_")
+    private String isReplied;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentCourseHomework setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getCourseHomeworkId() {
+        return courseHomeworkId;
+    }
+
+    public StudentCourseHomework setCourseHomeworkId(Long courseHomeworkId) {
+        this.courseHomeworkId = courseHomeworkId;
+        return this;
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public StudentCourseHomework setAttachments(String attachments) {
+        this.attachments = attachments;
+        return this;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public StudentCourseHomework setScore(Integer score) {
+        this.score = score;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentCourseHomework setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public StudentCourseHomework setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public StudentCourseHomework setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public StudentCourseHomework setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public StudentCourseHomework setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public String getIsReplied() {
+        return isReplied;
+    }
+
+    public StudentCourseHomework setIsReplied(String isReplied) {
+        this.isReplied = isReplied;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentCourseHomework{" +
+        ", id=" + id +
+        ", courseHomeworkId=" + courseHomeworkId +
+        ", attachments=" + attachments +
+        ", score=" + score +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", userId=" + userId +
+        ", remark=" + remark +
+        ", status=" + status +
+        ", isReplied=" + isReplied +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentCourseHomeworkReply.java

@@ -0,0 +1,120 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生课程作业留言表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_course_homework_reply")
+public class StudentCourseHomeworkReply extends Model<StudentCourseHomeworkReply> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 作业编号
+     */
+    @TableField("student_course_homework_id_")
+    private Long studentCourseHomeworkId;
+    /**
+     * 留言人编号
+     */
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 留言内容
+     */
+    @TableField("content_")
+    private String content;
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 父级编号
+     */
+    @TableField("parent_id_")
+    private Long parentId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentCourseHomeworkReply setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getStudentCourseHomeworkId() {
+        return studentCourseHomeworkId;
+    }
+
+    public StudentCourseHomeworkReply setStudentCourseHomeworkId(Long studentCourseHomeworkId) {
+        this.studentCourseHomeworkId = studentCourseHomeworkId;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public StudentCourseHomeworkReply setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public StudentCourseHomeworkReply setContent(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentCourseHomeworkReply setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public StudentCourseHomeworkReply setParentId(Long parentId) {
+        this.parentId = parentId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentCourseHomeworkReply{" +
+        ", id=" + id +
+        ", studentCourseHomeworkId=" + studentCourseHomeworkId +
+        ", userId=" + userId +
+        ", content=" + content +
+        ", createTime=" + createTime +
+        ", parentId=" + parentId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentPaymentOrder.java

@@ -0,0 +1,258 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生缴费订单表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_payment_order")
+public class StudentPaymentOrder extends Model<StudentPaymentOrder> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Long id;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 订单类型(报名、续费、小课购买、其他)
+     */
+    @TableField("type_")
+    private String type;
+    /**
+     * 预计金额
+     */
+    @TableField("expect_amount_")
+    private BigDecimal expectAmount;
+    /**
+     * 实际金额
+     */
+    @TableField("actual_amount_")
+    private BigDecimal actualAmount;
+    /**
+     * 交易流水号
+     */
+    @TableField("trans_no_")
+    private String transNo;
+    /**
+     * 交易状态
+     */
+    @TableField("status_")
+    private String status;
+    /**
+     * 备注
+     */
+    @TableField("memo_")
+    private String memo;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 付款渠道
+     */
+    @TableField("payment_channel_")
+    private String paymentChannel;
+    /**
+     * 业务渠道
+     */
+    @TableField("payment_business_channel_")
+    private String paymentBusinessChannel;
+    /**
+     * 付款账户
+     */
+    @TableField("payment_account_no_")
+    private String paymentAccountNo;
+    /**
+     * 订单号
+     */
+    @TableField("order_no_")
+    private String orderNo;
+    @TableField("music_group_id_")
+    private String musicGroupId;
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentPaymentOrder setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public StudentPaymentOrder setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public StudentPaymentOrder setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public BigDecimal getExpectAmount() {
+        return expectAmount;
+    }
+
+    public StudentPaymentOrder setExpectAmount(BigDecimal expectAmount) {
+        this.expectAmount = expectAmount;
+        return this;
+    }
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public StudentPaymentOrder setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+        return this;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public StudentPaymentOrder setTransNo(String transNo) {
+        this.transNo = transNo;
+        return this;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public StudentPaymentOrder setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public StudentPaymentOrder setMemo(String memo) {
+        this.memo = memo;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentPaymentOrder setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public StudentPaymentOrder setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public StudentPaymentOrder setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+        return this;
+    }
+
+    public String getPaymentBusinessChannel() {
+        return paymentBusinessChannel;
+    }
+
+    public StudentPaymentOrder setPaymentBusinessChannel(String paymentBusinessChannel) {
+        this.paymentBusinessChannel = paymentBusinessChannel;
+        return this;
+    }
+
+    public String getPaymentAccountNo() {
+        return paymentAccountNo;
+    }
+
+    public StudentPaymentOrder setPaymentAccountNo(String paymentAccountNo) {
+        this.paymentAccountNo = paymentAccountNo;
+        return this;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public StudentPaymentOrder setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+        return this;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public StudentPaymentOrder setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public StudentPaymentOrder setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentPaymentOrder{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", type=" + type +
+        ", expectAmount=" + expectAmount +
+        ", actualAmount=" + actualAmount +
+        ", transNo=" + transNo +
+        ", status=" + status +
+        ", memo=" + memo +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", paymentChannel=" + paymentChannel +
+        ", paymentBusinessChannel=" + paymentBusinessChannel +
+        ", paymentAccountNo=" + paymentAccountNo +
+        ", orderNo=" + orderNo +
+        ", musicGroupId=" + musicGroupId +
+        ", classGroupId=" + classGroupId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentPaymentOrderDetail.java

@@ -0,0 +1,133 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生缴费订单明细
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_payment_order_detail")
+public class StudentPaymentOrderDetail extends Model<StudentPaymentOrderDetail> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 类型(乐器、辅件、教材、课程)
+     */
+    @TableField("type_")
+    private String type;
+    /**
+     * 商品列表(用户|分开)
+     */
+    @TableField("goods_id_list_")
+    private String goodsIdList;
+    /**
+     * 打包价格
+     */
+    @TableField("price_")
+    private BigDecimal price;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 订单编号(对应student_payment_order)
+     */
+    @TableField("payment_order_id_")
+    private Long paymentOrderId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentPaymentOrderDetail setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public StudentPaymentOrderDetail setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getGoodsIdList() {
+        return goodsIdList;
+    }
+
+    public StudentPaymentOrderDetail setGoodsIdList(String goodsIdList) {
+        this.goodsIdList = goodsIdList;
+        return this;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public StudentPaymentOrderDetail setPrice(BigDecimal price) {
+        this.price = price;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentPaymentOrderDetail setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public StudentPaymentOrderDetail setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Long getPaymentOrderId() {
+        return paymentOrderId;
+    }
+
+    public StudentPaymentOrderDetail setPaymentOrderId(Long paymentOrderId) {
+        this.paymentOrderId = paymentOrderId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentPaymentOrderDetail{" +
+        ", id=" + id +
+        ", type=" + type +
+        ", goodsIdList=" + goodsIdList +
+        ", price=" + price +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", paymentOrderId=" + paymentOrderId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentRecharge.java

@@ -0,0 +1,216 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 充值记录表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_recharge")
+public class StudentRecharge extends Model<StudentRecharge> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 充值流水号
+     */
+    @TableId("id_")
+    private String id;
+    /**
+     * 用户编号
+     */
+    @TableField("user_id_")
+    private Long userId;
+    /**
+     * 交易流水号,第三方支付机构返回的
+     */
+    @TableField("trans_no_")
+    private String transNo;
+    /**
+     * 1,交易中;2,成功交易;3,交易失败;4,交易关闭
+     */
+    @TableField("status_")
+    private Integer status;
+    /**
+     * 充值金额
+     */
+    @TableField("amount_")
+    private BigDecimal amount;
+    /**
+     * 用户承担的充值费用（单位：元）
+     */
+    @TableField("fee_user_")
+    private BigDecimal feeUser;
+    /**
+     * 平台承担的费用（单位：元）
+     */
+    @TableField("fee_platform_")
+    private BigDecimal feePlatform;
+    /**
+     * 第三方支付平台名称(用拼音简称代替)
+     */
+    @TableField("pay_platform_")
+    private String payPlatform;
+    /**
+     * 描述
+     */
+    @TableField("description_")
+    private String description;
+    /**
+     * 后台备注
+     */
+    @TableField("comment_")
+    private String comment;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 最后修改时间
+     */
+    @TableField("modify_time_")
+    private Date modifyTime;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public StudentRecharge setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public StudentRecharge setUserId(Long userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public StudentRecharge setTransNo(String transNo) {
+        this.transNo = transNo;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public StudentRecharge setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public StudentRecharge setAmount(BigDecimal amount) {
+        this.amount = amount;
+        return this;
+    }
+
+    public BigDecimal getFeeUser() {
+        return feeUser;
+    }
+
+    public StudentRecharge setFeeUser(BigDecimal feeUser) {
+        this.feeUser = feeUser;
+        return this;
+    }
+
+    public BigDecimal getFeePlatform() {
+        return feePlatform;
+    }
+
+    public StudentRecharge setFeePlatform(BigDecimal feePlatform) {
+        this.feePlatform = feePlatform;
+        return this;
+    }
+
+    public String getPayPlatform() {
+        return payPlatform;
+    }
+
+    public StudentRecharge setPayPlatform(String payPlatform) {
+        this.payPlatform = payPlatform;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public StudentRecharge setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public StudentRecharge setComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentRecharge setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public StudentRecharge setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentRecharge{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", transNo=" + transNo +
+        ", status=" + status +
+        ", amount=" + amount +
+        ", feeUser=" + feeUser +
+        ", feePlatform=" + feePlatform +
+        ", payPlatform=" + payPlatform +
+        ", description=" + description +
+        ", comment=" + comment +
+        ", createTime=" + createTime +
+        ", modifyTime=" + modifyTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentRegistration.java

@@ -0,0 +1,291 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 学生报名表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_registration")
+public class StudentRegistration extends Model<StudentRegistration> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("user_id_")
+    private Integer userId;
+    /**
+     * 学生姓名
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 所属乐团（对应 music_group 表id）
+     */
+    @TableField("music_group_id_")
+    private Integer musicGroupId;
+    /**
+     * 当前所在年级
+     */
+    @TableField("current_grade_")
+    private String currentGrade;
+    /**
+     * 当前所在班级
+     */
+    @TableField("current_class_")
+    private String currentClass;
+    /**
+     * 报名科目
+     */
+    @TableField("subject_id_")
+    private Integer subjectId;
+    /**
+     * 是否允许调剂
+     */
+    @TableField("is_allow_adjust_")
+    private String isAllowAdjust;
+    /**
+     * 器材购买方式（团购、自备）
+     */
+    @TableField("kit_purchase_method_")
+    private String kitPurchaseMethod;
+    @TableField("remark_")
+    private String remark;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 家长姓名
+     */
+    @TableField("parents_name_")
+    private String parentsName;
+    /**
+     * 家长电话
+     */
+    @TableField("parents_phone_")
+    private String parentsPhone;
+    /**
+     * 家长单位
+     */
+    @TableField("parents_company_")
+    private String parentsCompany;
+    /**
+     * 缴费状态（1-已缴费 0-未交费）
+     */
+    @TableField("payment_status_")
+    private String paymentStatus;
+    /**
+     * 实际科目编号
+     */
+    @TableField("actual_subject_id_")
+    private Integer actualSubjectId;
+    /**
+     * 班级id
+     */
+    @TableField("class_group_id_")
+    private Integer classGroupId;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public StudentRegistration setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public StudentRegistration setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public StudentRegistration setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public StudentRegistration setMusicGroupId(Integer musicGroupId) {
+        this.musicGroupId = musicGroupId;
+        return this;
+    }
+
+    public String getCurrentGrade() {
+        return currentGrade;
+    }
+
+    public StudentRegistration setCurrentGrade(String currentGrade) {
+        this.currentGrade = currentGrade;
+        return this;
+    }
+
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public StudentRegistration setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+        return this;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public StudentRegistration setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    public String getIsAllowAdjust() {
+        return isAllowAdjust;
+    }
+
+    public StudentRegistration setIsAllowAdjust(String isAllowAdjust) {
+        this.isAllowAdjust = isAllowAdjust;
+        return this;
+    }
+
+    public String getKitPurchaseMethod() {
+        return kitPurchaseMethod;
+    }
+
+    public StudentRegistration setKitPurchaseMethod(String kitPurchaseMethod) {
+        this.kitPurchaseMethod = kitPurchaseMethod;
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public StudentRegistration setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentRegistration setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public StudentRegistration setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getParentsName() {
+        return parentsName;
+    }
+
+    public StudentRegistration setParentsName(String parentsName) {
+        this.parentsName = parentsName;
+        return this;
+    }
+
+    public String getParentsPhone() {
+        return parentsPhone;
+    }
+
+    public StudentRegistration setParentsPhone(String parentsPhone) {
+        this.parentsPhone = parentsPhone;
+        return this;
+    }
+
+    public String getParentsCompany() {
+        return parentsCompany;
+    }
+
+    public StudentRegistration setParentsCompany(String parentsCompany) {
+        this.parentsCompany = parentsCompany;
+        return this;
+    }
+
+    public String getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public StudentRegistration setPaymentStatus(String paymentStatus) {
+        this.paymentStatus = paymentStatus;
+        return this;
+    }
+
+    public Integer getActualSubjectId() {
+        return actualSubjectId;
+    }
+
+    public StudentRegistration setActualSubjectId(Integer actualSubjectId) {
+        this.actualSubjectId = actualSubjectId;
+        return this;
+    }
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public StudentRegistration setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentRegistration{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", name=" + name +
+        ", musicGroupId=" + musicGroupId +
+        ", currentGrade=" + currentGrade +
+        ", currentClass=" + currentClass +
+        ", subjectId=" + subjectId +
+        ", isAllowAdjust=" + isAllowAdjust +
+        ", kitPurchaseMethod=" + kitPurchaseMethod +
+        ", remark=" + remark +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", parentsName=" + parentsName +
+        ", parentsPhone=" + parentsPhone +
+        ", parentsCompany=" + parentsCompany +
+        ", paymentStatus=" + paymentStatus +
+        ", actualSubjectId=" + actualSubjectId +
+        ", classGroupId=" + classGroupId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/StudentWithdraw.java

@@ -0,0 +1,216 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 提现记录表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("student_withdraw")
+public class StudentWithdraw extends Model<StudentWithdraw> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 提现流水号
+     */
+    @TableId("id_")
+    private String id;
+    /**
+     * 用户编号
+     */
+    @TableField("user_id_")
+    private Long userId;
+    /**
+     * 银行卡号
+     */
+    @TableField("bank_card_no_")
+    private String bankCardNo;
+    /**
+     * 银行流水号
+     */
+    @TableField("trans_no_")
+    private String transNo;
+    /**
+     * 交易状态(1,交易中;2,成功交易;3,交易失败;4,交易关闭)
+     */
+    @TableField("status_")
+    private Integer status;
+    /**
+     * 提现金额
+     */
+    @TableField("amount_")
+    private BigDecimal amount;
+    /**
+     * 用户承担的费用（单位：分）
+     */
+    @TableField("fee_user_")
+    private BigDecimal feeUser;
+    /**
+     * 平台承担的费用（单位：分）
+     */
+    @TableField("fee_platform_")
+    private BigDecimal feePlatform;
+    /**
+     * 描述
+     */
+    @TableField("description_")
+    private String description;
+    /**
+     * 备注
+     */
+    @TableField("comment_")
+    private String comment;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @TableField("modify_time_")
+    private Date modifyTime;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public StudentWithdraw setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public StudentWithdraw setUserId(Long userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getBankCardNo() {
+        return bankCardNo;
+    }
+
+    public StudentWithdraw setBankCardNo(String bankCardNo) {
+        this.bankCardNo = bankCardNo;
+        return this;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public StudentWithdraw setTransNo(String transNo) {
+        this.transNo = transNo;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public StudentWithdraw setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public StudentWithdraw setAmount(BigDecimal amount) {
+        this.amount = amount;
+        return this;
+    }
+
+    public BigDecimal getFeeUser() {
+        return feeUser;
+    }
+
+    public StudentWithdraw setFeeUser(BigDecimal feeUser) {
+        this.feeUser = feeUser;
+        return this;
+    }
+
+    public BigDecimal getFeePlatform() {
+        return feePlatform;
+    }
+
+    public StudentWithdraw setFeePlatform(BigDecimal feePlatform) {
+        this.feePlatform = feePlatform;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public StudentWithdraw setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public StudentWithdraw setComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StudentWithdraw setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public StudentWithdraw setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "StudentWithdraw{" +
+        ", id=" + id +
+        ", userId=" + userId +
+        ", bankCardNo=" + bankCardNo +
+        ", transNo=" + transNo +
+        ", status=" + status +
+        ", amount=" + amount +
+        ", feeUser=" + feeUser +
+        ", feePlatform=" + feePlatform +
+        ", description=" + description +
+        ", comment=" + comment +
+        ", createTime=" + createTime +
+        ", modifyTime=" + modifyTime +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/Subject.java

@@ -0,0 +1,118 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 科目(声部)
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+public class Subject extends Model<Subject> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+    @TableField("name_")
+    private String name;
+    @TableField("code_")
+    private String code;
+    @TableField("parent_subject_id_")
+    private Integer parentSubjectId;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    @TableField("del_flag_")
+    private Integer delFlag;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Subject setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Subject setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public Subject setCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    public Integer getParentSubjectId() {
+        return parentSubjectId;
+    }
+
+    public Subject setParentSubjectId(Integer parentSubjectId) {
+        this.parentSubjectId = parentSubjectId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public Subject setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public Subject setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public Subject setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Subject{" +
+                ", id=" + id +
+                ", name=" + name +
+                ", code=" + code +
+                ", parentSubjectId=" + parentSubjectId +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/SubjectGoodsMapper.java

@@ -0,0 +1,123 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 科目与商品默认关联表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("subject_goods_mapper")
+public class SubjectGoodsMapper extends Model<SubjectGoodsMapper> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @TableField("organ_id_")
+    private Integer organId;
+    @TableField("subject_id_")
+    private String subjectId;
+    @TableField("goods_category_id_")
+    private Integer goodsCategoryId;
+    @TableField("create_time_")
+    private Date createTime;
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 类型(乐器、教辅)
+     */
+    @TableField("type_")
+    private String type;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public SubjectGoodsMapper setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public SubjectGoodsMapper setOrganId(Integer organId) {
+        this.organId = organId;
+        return this;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public SubjectGoodsMapper setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+        return this;
+    }
+
+    public Integer getGoodsCategoryId() {
+        return goodsCategoryId;
+    }
+
+    public SubjectGoodsMapper setGoodsCategoryId(Integer goodsCategoryId) {
+        this.goodsCategoryId = goodsCategoryId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public SubjectGoodsMapper setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public SubjectGoodsMapper setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public SubjectGoodsMapper setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "SubjectGoodsMapper{" +
+        ", id=" + id +
+        ", organId=" + organId +
+        ", subjectId=" + subjectId +
+        ", goodsCategoryId=" + goodsCategoryId +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", type=" + type +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/SysArea.java

@@ -0,0 +1,137 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 区域表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("sys_area")
+public class SysArea extends Model<SysArea> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id_")
+    private Integer id;
+    /**
+     * 名称
+     */
+    @TableField("name_")
+    private String name;
+    /**
+     * 编码
+     */
+    @TableField("code_")
+    private Integer code;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time_")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @TableField("update_time_")
+    private Date updateTime;
+    /**
+     * 是否删除  -1：已删除  0：正常
+     */
+    @TableField("del_flag_")
+    private String delFlag;
+    /**
+     * 父节点编号
+     */
+    @TableField("parent_organ_id_")
+    private Integer parentOrganId;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public SysArea setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public SysArea setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public SysArea setCode(Integer code) {
+        this.code = code;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public SysArea setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public SysArea setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public SysArea setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+        return this;
+    }
+
+    public Integer getParentOrganId() {
+        return parentOrganId;
+    }
+
+    public SysArea setParentOrganId(Integer parentOrganId) {
+        this.parentOrganId = parentOrganId;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "SysArea{" +
+        ", id=" + id +
+        ", name=" + name +
+        ", code=" + code +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        ", delFlag=" + delFlag +
+        ", parentOrganId=" + parentOrganId +
+        "}";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/SysAuditLog.java

@@ -0,0 +1,138 @@
+package com.ym.mec.education.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 日志审计表
+ * </p>
+ *
+ * @author lemeng
+ * @since 2019-09-25
+ */
+@TableName("sys_audit_log")
+public class SysAuditLog extends Model<SysAuditLog> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 用户名称
+     */
+    @TableField("username_")
+    private String username;
+    /**
+     * 操作名称
+     */
+    @TableField("operate_name_")
+    private String operateName;
+    /**
+     * 接口地址
+     */
+    @TableField("interface_url_")
+    private String interfaceUrl;
+    /**
+     * 输入参数
+     */
+    @TableField("input_params_")
+    private String inputParams;
+    /**
+     * 操作时间
+     */
+    @TableField("operate_time_")
+    private Date operateTime;
+    /**
+     * 用户IP
+     */
+    @TableField("user_ip_")
+    private String userIp;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public SysAuditLog setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public SysAuditLog setUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public String getOperateName() {
+        return operateName;
+    }
+
+    public SysAuditLog setOperateName(String operateName) {
+        this.operateName = operateName;
+        return this;
+    }
+
+    public String getInterfaceUrl() {
+        return interfaceUrl;
+    }
+
+    public SysAuditLog setInterfaceUrl(String interfaceUrl) {
+        this.interfaceUrl = interfaceUrl;
+        return this;
+    }
+
+    public String getInputParams() {
+        return inputParams;
+    }
+
+    public SysAuditLog setInputParams(String inputParams) {
+        this.inputParams = inputParams;
+        return this;
+    }
+
+    public Date getOperateTime() {
+        return operateTime;
+    }
+
+    public SysAuditLog setOperateTime(Date operateTime) {
+        this.operateTime = operateTime;
+        return this;
+    }
+
+    public String getUserIp() {
+        return userIp;
+    }
+
+    public SysAuditLog setUserIp(String userIp) {
+        this.userIp = userIp;
+        return this;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "SysAuditLog{" +
+        ", id=" + id +
+        ", username=" + username +
+        ", operateName=" + operateName +
+        ", interfaceUrl=" + interfaceUrl +
+        ", inputParams=" + inputParams +
+        ", operateTime=" + operateTime +
+        ", userIp=" + userIp +
+        "}";
+    }
+}