add

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.CourseScheduleHistory;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface CourseScheduleHistoryDao extends BaseDAO<Long, CourseScheduleHistory> {
+
+	
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface MusicGroupQuitDao extends BaseDAO<Long, MusicGroupQuit> {
+
+	
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity> {
+
+	
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGroupDefaultClassesCycle> {
+
+	
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface VipGroupDefaultClassesUnitPriceDao extends BaseDAO<Integer, VipGroupDefaultClassesUnitPrice> {
+
+	
+}

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

@@ -0,0 +1,180 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(course_schedule_history):
+ */
+public class CourseScheduleHistory {
+
+	/**  */
+	private Long id;
+	
+	/** 班级编号 */
+	private Integer classGroupId;
+	
+	/** 课程状态 */
+	private String status;
+	
+	/** 补贴 */
+	private java.math.BigDecimal subsidy;
+	
+	/** 上课日期 */
+	private java.util.Date classDate;
+	
+	/** 上课时间 */
+	private java.util.Date startClassTime;
+	
+	/** 结束时间 */
+	private java.util.Date endClassTime;
+	
+	/** 上课教师 */
+	private Integer teacherId;
+	
+	/** 实际上课教师 */
+	private Integer actualTeacherId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/** 教学形式（线上、线下） */
+	private String teachMode;
+	
+	/** 投诉状态 */
+	private String complaintStatus;
+	
+	/** 课程类型(单技课、小班课、合奏课、综合课、练习课、启蒙课、集训课、VIP课、试听课) */
+	private String type;
+	
+	/** 课程编号 */
+	private Long courseScheduleId;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setClassGroupId(Integer classGroupId){
+		this.classGroupId = classGroupId;
+	}
+	
+	public Integer getClassGroupId(){
+		return this.classGroupId;
+	}
+			
+	public void setStatus(String status){
+		this.status = status;
+	}
+	
+	public String getStatus(){
+		return this.status;
+	}
+			
+	public void setSubsidy(java.math.BigDecimal subsidy){
+		this.subsidy = subsidy;
+	}
+	
+	public java.math.BigDecimal getSubsidy(){
+		return this.subsidy;
+	}
+			
+	public void setClassDate(java.util.Date classDate){
+		this.classDate = classDate;
+	}
+	
+	public java.util.Date getClassDate(){
+		return this.classDate;
+	}
+			
+	public void setStartClassTime(java.util.Date startClassTime){
+		this.startClassTime = startClassTime;
+	}
+	
+	public java.util.Date getStartClassTime(){
+		return this.startClassTime;
+	}
+			
+	public void setEndClassTime(java.util.Date endClassTime){
+		this.endClassTime = endClassTime;
+	}
+	
+	public java.util.Date getEndClassTime(){
+		return this.endClassTime;
+	}
+			
+	public void setTeacherId(Integer teacherId){
+		this.teacherId = teacherId;
+	}
+	
+	public Integer getTeacherId(){
+		return this.teacherId;
+	}
+			
+	public void setActualTeacherId(Integer actualTeacherId){
+		this.actualTeacherId = actualTeacherId;
+	}
+	
+	public Integer getActualTeacherId(){
+		return this.actualTeacherId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setTeachMode(String teachMode){
+		this.teachMode = teachMode;
+	}
+	
+	public String getTeachMode(){
+		return this.teachMode;
+	}
+			
+	public void setComplaintStatus(String complaintStatus){
+		this.complaintStatus = complaintStatus;
+	}
+	
+	public String getComplaintStatus(){
+		return this.complaintStatus;
+	}
+			
+	public void setType(String type){
+		this.type = type;
+	}
+	
+	public String getType(){
+		return this.type;
+	}
+			
+	public void setCourseScheduleId(Long courseScheduleId){
+		this.courseScheduleId = courseScheduleId;
+	}
+	
+	public Long getCourseScheduleId(){
+		return this.courseScheduleId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,92 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_quit):
+ */
+public class MusicGroupQuit {
+
+	/**  */
+	private Long id;
+	
+	/** 用户编号 */
+	private Integer userId;
+	
+	/** 乐团编号 */
+	private Integer musicGroupId;
+	
+	/** 加入时间 */
+	private java.util.Date joinDate;
+	
+	/** 退出时间 */
+	private java.util.Date quitDate;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/** 原因 */
+	private String reason;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setMusicGroupId(Integer musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public Integer getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setJoinDate(java.util.Date joinDate){
+		this.joinDate = joinDate;
+	}
+	
+	public java.util.Date getJoinDate(){
+		return this.joinDate;
+	}
+			
+	public void setQuitDate(java.util.Date quitDate){
+		this.quitDate = quitDate;
+	}
+	
+	public java.util.Date getQuitDate(){
+		return this.quitDate;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setReason(String reason){
+		this.reason = reason;
+	}
+	
+	public String getReason(){
+		return this.reason;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -1,11 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.AuditStatusEnum;
-
-import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+
 /**
  * 对应数据库表(teacher_leave_record):
  */
@@ -15,23 +13,18 @@ public class TeacherLeaveRecord {
 	private Long id;
 	
 	/**  */
-	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 	
 	/** 请假天数 */
-	@ApiModelProperty(value = "请假天数",required = false)
-	private Integer days;
+	private double days;
 	
 	/** 请假类型 */
-	@ApiModelProperty(value = "请假类型",required = false)
 	private String type;
 	
 	/** 请假状态（审批中、拒绝、通过） */
-	@ApiModelProperty(value = "请假审核状态",required = false)
 	private AuditStatusEnum status;
 	
 	/** 备注 */
-	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
 	
 	/**  */
@@ -40,6 +33,21 @@ public class TeacherLeaveRecord {
 	/**  */
 	private java.util.Date updateTime;
 	
+	/** 请假开始时间 */
+	private java.util.Date startTime;
+	
+	/** 请假结束时间 */
+	private java.util.Date endTime;
+	
+	/** 课程调整 */
+	private String coursesScheduleJson;
+	
+	/** 流程定义 */
+	private String wfProcessId;
+	
+	/** 流程实例 */
+	private String wfOrderId;
+	
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -56,11 +64,11 @@ public class TeacherLeaveRecord {
 		return this.userId;
 	}
 			
-	public void setDays(Integer days){
+	public void setDays(double days){
 		this.days = days;
 	}
 	
-	public Integer getDays(){
+	public double getDays(){
 		return this.days;
 	}
 			
@@ -71,15 +79,15 @@ public class TeacherLeaveRecord {
 	public String getType(){
 		return this.type;
 	}
-
-	public AuditStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(AuditStatusEnum status) {
+			
+	public void setStatus(AuditStatusEnum status){
 		this.status = status;
 	}
-
+	
+	public AuditStatusEnum getStatus(){
+		return this.status;
+	}
+			
 	public void setRemark(String remark){
 		this.remark = remark;
 	}
@@ -104,6 +112,46 @@ public class TeacherLeaveRecord {
 		return this.updateTime;
 	}
 			
+	public void setStartTime(java.util.Date startTime){
+		this.startTime = startTime;
+	}
+	
+	public java.util.Date getStartTime(){
+		return this.startTime;
+	}
+			
+	public void setEndTime(java.util.Date endTime){
+		this.endTime = endTime;
+	}
+	
+	public java.util.Date getEndTime(){
+		return this.endTime;
+	}
+			
+	public void setCoursesScheduleJson(String coursesScheduleJson){
+		this.coursesScheduleJson = coursesScheduleJson;
+	}
+	
+	public String getCoursesScheduleJson(){
+		return this.coursesScheduleJson;
+	}
+			
+	public void setWfProcessId(String wfProcessId){
+		this.wfProcessId = wfProcessId;
+	}
+	
+	public String getWfProcessId(){
+		return this.wfProcessId;
+	}
+			
+	public void setWfOrderId(String wfOrderId){
+		this.wfOrderId = wfOrderId;
+	}
+	
+	public String getWfOrderId(){
+		return this.wfOrderId;
+	}
+			
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,213 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(vip_group_activity):
+ */
+public class VipGroupActivity {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private String name;
+	
+	/**  */
+	private String description;
+	
+	/**  */
+	private String vipGroupCategoryIdList;
+	
+	/**  */
+	private java.util.Date startTime;
+	
+	/**  */
+	private java.util.Date endTime;
+	
+	/**  */
+	private Integer organId;
+	
+	/**  */
+	private java.util.Date coursesStartTime;
+	
+	/**  */
+	private java.util.Date coursesEndTime;
+	
+	/** 活动类型（基础活动、折扣、赠送课时） */
+	private String type;
+	
+	/**  */
+	private String attribute1;
+	
+	/**  */
+	private String attribute2;
+	
+	/**  */
+	private String attribute3;
+	
+	/** 薪水只读标识（1-只读 0-可写） */
+	private String salaryReadonlyFlag;
+	
+	/** 赠送课时支付薪水标识（1-计课酬  0-不计课酬） */
+	private String giveClassPaySalaryFlag;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/** 结算标准 */
+	private String salarySettlementJson;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setDescription(String description){
+		this.description = description;
+	}
+	
+	public String getDescription(){
+		return this.description;
+	}
+			
+	public void setVipGroupCategoryIdList(String vipGroupCategoryIdList){
+		this.vipGroupCategoryIdList = vipGroupCategoryIdList;
+	}
+	
+	public String getVipGroupCategoryIdList(){
+		return this.vipGroupCategoryIdList;
+	}
+			
+	public void setStartTime(java.util.Date startTime){
+		this.startTime = startTime;
+	}
+	
+	public java.util.Date getStartTime(){
+		return this.startTime;
+	}
+			
+	public void setEndTime(java.util.Date endTime){
+		this.endTime = endTime;
+	}
+	
+	public java.util.Date getEndTime(){
+		return this.endTime;
+	}
+			
+	public void setOrganId(Integer organId){
+		this.organId = organId;
+	}
+	
+	public Integer getOrganId(){
+		return this.organId;
+	}
+			
+	public void setCoursesStartTime(java.util.Date coursesStartTime){
+		this.coursesStartTime = coursesStartTime;
+	}
+	
+	public java.util.Date getCoursesStartTime(){
+		return this.coursesStartTime;
+	}
+			
+	public void setCoursesEndTime(java.util.Date coursesEndTime){
+		this.coursesEndTime = coursesEndTime;
+	}
+	
+	public java.util.Date getCoursesEndTime(){
+		return this.coursesEndTime;
+	}
+			
+	public void setType(String type){
+		this.type = type;
+	}
+	
+	public String getType(){
+		return this.type;
+	}
+			
+	public void setAttribute1(String attribute1){
+		this.attribute1 = attribute1;
+	}
+	
+	public String getAttribute1(){
+		return this.attribute1;
+	}
+			
+	public void setAttribute2(String attribute2){
+		this.attribute2 = attribute2;
+	}
+	
+	public String getAttribute2(){
+		return this.attribute2;
+	}
+			
+	public void setAttribute3(String attribute3){
+		this.attribute3 = attribute3;
+	}
+	
+	public String getAttribute3(){
+		return this.attribute3;
+	}
+			
+	public void setSalaryReadonlyFlag(String salaryReadonlyFlag){
+		this.salaryReadonlyFlag = salaryReadonlyFlag;
+	}
+	
+	public String getSalaryReadonlyFlag(){
+		return this.salaryReadonlyFlag;
+	}
+			
+	public void setGiveClassPaySalaryFlag(String giveClassPaySalaryFlag){
+		this.giveClassPaySalaryFlag = giveClassPaySalaryFlag;
+	}
+	
+	public String getGiveClassPaySalaryFlag(){
+		return this.giveClassPaySalaryFlag;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setSalarySettlementJson(String salarySettlementJson){
+		this.salarySettlementJson = salarySettlementJson;
+	}
+	
+	public String getSalarySettlementJson(){
+		return this.salarySettlementJson;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -13,12 +13,6 @@ public class VipGroupCategory {
 	/** 名称 */
 	private String name;
 	
-	/** 线上薪水 */
-	private long onlineClassesSalary;
-	
-	/** 线下薪水 */
-	private long offlineClassesSalary;
-	
 	/**  */
 	private String delFlag;
 	
@@ -28,6 +22,12 @@ public class VipGroupCategory {
 	/**  */
 	private java.util.Date updateTime;
 	
+	/** 单节课时 */
+	private Integer singleClassMinutes;
+	
+	/** 学生数 */
+	private Integer studentNum;
+	
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -44,22 +44,6 @@ public class VipGroupCategory {
 		return this.name;
 	}
 			
-	public void setOnlineClassesSalary(long onlineClassesSalary){
-		this.onlineClassesSalary = onlineClassesSalary;
-	}
-	
-	public long getOnlineClassesSalary(){
-		return this.onlineClassesSalary;
-	}
-			
-	public void setOfflineClassesSalary(long offlineClassesSalary){
-		this.offlineClassesSalary = offlineClassesSalary;
-	}
-	
-	public long getOfflineClassesSalary(){
-		return this.offlineClassesSalary;
-	}
-			
 	public void setDelFlag(String delFlag){
 		this.delFlag = delFlag;
 	}
@@ -84,6 +68,22 @@ public class VipGroupCategory {
 		return this.updateTime;
 	}
 			
+	public void setSingleClassMinutes(Integer singleClassMinutes){
+		this.singleClassMinutes = singleClassMinutes;
+	}
+	
+	public Integer getSingleClassMinutes(){
+		return this.singleClassMinutes;
+	}
+			
+	public void setStudentNum(Integer studentNum){
+		this.studentNum = studentNum;
+	}
+	
+	public Integer getStudentNum(){
+		return this.studentNum;
+	}
+			
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,81 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(vip_group_default_classes_cycle):
+ */
+public class VipGroupDefaultClassesCycle {
+
+	/**  */
+	private Integer id;
+	
+	/** 最小课次 */
+	private Integer minClassTimes;
+	
+	/** 最大课次 */
+	private Integer maxClassTimes;
+	
+	/** 最大排课范围（月份） */
+	private Integer month;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setMinClassTimes(Integer minClassTimes){
+		this.minClassTimes = minClassTimes;
+	}
+	
+	public Integer getMinClassTimes(){
+		return this.minClassTimes;
+	}
+			
+	public void setMaxClassTimes(Integer maxClassTimes){
+		this.maxClassTimes = maxClassTimes;
+	}
+	
+	public Integer getMaxClassTimes(){
+		return this.maxClassTimes;
+	}
+			
+	public void setMonth(Integer month){
+		this.month = month;
+	}
+	
+	public Integer getMonth(){
+		return this.month;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,92 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(vip_group_default_classes_unit_price_):
+ */
+public class VipGroupDefaultClassesUnitPrice {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer organId;
+	
+	/**  */
+	private Integer vipGroupCategoryId;
+	
+	/**  */
+	private long onlineClassesUnitPrice;
+	
+	/**  */
+	private long offlineClassesUnitPrice;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setOrganId(Integer organId){
+		this.organId = organId;
+	}
+	
+	public Integer getOrganId(){
+		return this.organId;
+	}
+			
+	public void setVipGroupCategoryId(Integer vipGroupCategoryId){
+		this.vipGroupCategoryId = vipGroupCategoryId;
+	}
+	
+	public Integer getVipGroupCategoryId(){
+		return this.vipGroupCategoryId;
+	}
+			
+	public void setOnlineClassesUnitPrice(long onlineClassesUnitPrice){
+		this.onlineClassesUnitPrice = onlineClassesUnitPrice;
+	}
+	
+	public long getOnlineClassesUnitPrice(){
+		return this.onlineClassesUnitPrice;
+	}
+			
+	public void setOfflineClassesUnitPrice(long offlineClassesUnitPrice){
+		this.offlineClassesUnitPrice = offlineClassesUnitPrice;
+	}
+	
+	public long getOfflineClassesUnitPrice(){
+		return this.offlineClassesUnitPrice;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.CourseScheduleHistory;
+import com.ym.mec.common.service.BaseService;
+
+public interface CourseScheduleHistoryService extends BaseService<Long, CourseScheduleHistory> {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.common.service.BaseService;
+
+public interface MusicGroupQuitService extends BaseService<Long, MusicGroupQuit> {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.common.service.BaseService;
+
+public interface VipGroupActivityService extends BaseService<Integer, VipGroupActivity> {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.common.service.BaseService;
+
+public interface VipGroupDefaultClassesCycleService extends BaseService<Integer, VipGroupDefaultClassesCycle> {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.common.service.BaseService;
+
+public interface VipGroupDefaultClassesUnitPriceService extends BaseService<Integer, VipGroupDefaultClassesUnitPrice> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.CourseScheduleHistoryDao;
+import com.ym.mec.biz.dal.entity.CourseScheduleHistory;
+import com.ym.mec.biz.service.CourseScheduleHistoryService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class CourseScheduleHistoryServiceImpl extends BaseServiceImpl<Long, CourseScheduleHistory>  implements CourseScheduleHistoryService {
+	
+	@Autowired
+	private CourseScheduleHistoryDao courseScheduleHistoryDao;
+
+	@Override
+	public BaseDAO<Long, CourseScheduleHistory> getDAO() {
+		return courseScheduleHistoryDao;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.MusicGroupQuitDao;
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.biz.service.MusicGroupQuitService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQuit>  implements MusicGroupQuitService {
+	
+	@Autowired
+	private MusicGroupQuitDao musicGroupQuitDao;
+
+	@Override
+	public BaseDAO<Long, MusicGroupQuit> getDAO() {
+		return musicGroupQuitDao;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.biz.service.VipGroupActivityService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGroupActivity>  implements VipGroupActivityService {
+	
+	@Autowired
+	private VipGroupActivityDao vipGroupActivityDao;
+
+	@Override
+	public BaseDAO<Integer, VipGroupActivity> getDAO() {
+		return vipGroupActivityDao;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesCycleDao;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Integer, VipGroupDefaultClassesCycle>  implements VipGroupDefaultClassesCycleService {
+	
+	@Autowired
+	private VipGroupDefaultClassesCycleDao vipGroupDefaultClassesCycleDao;
+
+	@Override
+	public BaseDAO<Integer, VipGroupDefaultClassesCycle> getDAO() {
+		return vipGroupDefaultClassesCycleDao;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<Integer, VipGroupDefaultClassesUnitPrice>  implements VipGroupDefaultClassesUnitPriceService {
+	
+	@Autowired
+	private VipGroupDefaultClassesUnitPriceDao vipGroupDefaultClassesUnitPriceDao;
+
+	@Override
+	public BaseDAO<Integer, VipGroupDefaultClassesUnitPrice> getDAO() {
+		return vipGroupDefaultClassesUnitPriceDao;
+	}
+	
+}

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

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.CourseScheduleHistoryDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.CourseScheduleHistory" id="CourseScheduleHistory">
+		<result column="id_" property="id" />
+		<result column="class_group_id_" property="classGroupId" />
+		<result column="status_" property="status" />
+		<result column="subsidy_" property="subsidy" />
+		<result column="class_date_" property="classDate" />
+		<result column="start_class_time_" property="startClassTime" />
+		<result column="end_class_time_" property="endClassTime" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="actual_teacher_id_" property="actualTeacherId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="teach_mode_" property="teachMode" />
+		<result column="complaint_status_" property="complaintStatus" />
+		<result column="type_" property="type" />
+		<result column="course_schedule_id_" property="courseScheduleId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="CourseScheduleHistory" >
+		SELECT * FROM course_schedule_history WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="CourseScheduleHistory">
+		SELECT * FROM course_schedule_history ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleHistory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO course_schedule_history (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_,type_,course_schedule_id_) VALUES(#{id},#{classGroupId},#{status},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},#{updateTime},#{teachMode},#{complaintStatus},#{type},#{courseScheduleId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleHistory">
+		UPDATE course_schedule_history <set>
+<if test="status != null">
+status_ = #{status},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="classGroupId != null">
+class_group_id_ = #{classGroupId},
+</if>
+<if test="teachMode != null">
+teach_mode_ = #{teachMode},
+</if>
+<if test="complaintStatus != null">
+complaint_status_ = #{complaintStatus},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+<if test="classDate != null">
+class_date_ = #{classDate},
+</if>
+<if test="endClassTime != null">
+end_class_time_ = #{endClassTime},
+</if>
+<if test="actualTeacherId != null">
+actual_teacher_id_ = #{actualTeacherId},
+</if>
+<if test="subsidy != null">
+subsidy_ = #{subsidy},
+</if>
+<if test="startClassTime != null">
+start_class_time_ = #{startClassTime},
+</if>
+<if test="teacherId != null">
+teacher_id_ = #{teacherId},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="courseScheduleId != null">
+course_schedule_id_ = #{courseScheduleId},
+</if>
+<if test="type != null">
+type_ = #{type},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM course_schedule_history WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="CourseScheduleHistory" parameterType="map">
+		SELECT * FROM course_schedule_history ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM course_schedule_history
+	</select>
+</mapper>

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MusicGroupQuitDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupQuit" id="MusicGroupQuit">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="join_date_" property="joinDate" />
+		<result column="quit_date_" property="quitDate" />
+		<result column="create_time_" property="createTime" />
+		<result column="reason_" property="reason" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupQuit" >
+		SELECT * FROM music_group_quit WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupQuit">
+		SELECT * FROM music_group_quit ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuit" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO music_group_quit (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_) VALUES(#{id},#{userId},#{musicGroupId},#{joinDate},#{quitDate},#{createTime},#{reason})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuit">
+		UPDATE music_group_quit <set>
+<if test="userId != null">
+user_id_ = #{userId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="joinDate != null">
+join_date_ = #{joinDate},
+</if>
+<if test="reason != null">
+reason_ = #{reason},
+</if>
+<if test="quitDate != null">
+quit_date_ = #{quitDate},
+</if>
+<if test="musicGroupId != null">
+music_group_id_ = #{musicGroupId},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_group_quit WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupQuit" parameterType="map">
+		SELECT * FROM music_group_quit ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_quit
+	</select>
+</mapper>

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

@@ -1,83 +1,110 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.biz.dal.dao.TeacherLeaveRecordDao">
 
-    <resultMap type="com.ym.mec.biz.dal.entity.TeacherLeaveRecord" id="TeacherLeaveRecord">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="days_" property="days"/>
-        <result column="type_" property="type"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="remark_" property="remark"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
+	<resultMap type="com.ym.mec.biz.dal.entity.TeacherLeaveRecord"
+		id="TeacherLeaveRecord">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="days_" property="days" />
+		<result column="type_" property="type" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="remark_" property="remark" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="start_time_" property="startTime" />
+		<result column="end_time_" property="endTime" />
+		<result column="courses_schedule_json_" property="coursesScheduleJson" />
+		<result column="wf_process_id_" property="wfProcessId" />
+		<result column="wf_order_id_" property="wfOrderId" />
+	</resultMap>
 
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="TeacherLeaveRecord">
-		SELECT * FROM teacher_leave_record WHERE id_ = #{id} 
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="TeacherLeaveRecord">
+		SELECT * FROM
+		teacher_leave_record WHERE id_ = #{id}
 	</select>
 
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="TeacherLeaveRecord">
-		SELECT * FROM teacher_leave_record ORDER BY id_
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="TeacherLeaveRecord">
+		SELECT * FROM
+		teacher_leave_record ORDER BY id_
 	</select>
 
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherLeaveRecord" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO teacher_leave_record (id_,user_id_,days_,type_,status_,remark_,create_time_,update_time_)
-        VALUES(#{id},#{userId},#{days},#{type},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now(),now())
-    </insert>
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherLeaveRecord"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO teacher_leave_record
+		(id_,user_id_,days_,type_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_)
+		VALUES(#{id},#{userId},#{days},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},#{updateTime},#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
+	</insert>
 
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.biz.dal.entity.TeacherLeaveRecord">
-        UPDATE teacher_leave_record
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="remark != null">
-                remark_ = #{remark},
-            </if>
-            <if test="days != null">
-                days_ = #{days},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="type != null">
-                type_ = #{type},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.TeacherLeaveRecord">
+		UPDATE teacher_leave_record
+		<set>
+			<if test="status != null">
+				status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="wfOrderId != null">
+				wf_order_id_ = #{wfOrderId},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="days != null">
+				days_ = #{days},
+			</if>
+			<if test="endTime != null">
+				end_time_ = #{endTime},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+			<if test="startTime != null">
+				start_time_ = #{startTime},
+			</if>
+			<if test="coursesScheduleJson != null">
+				courses_schedule_json_ = #{coursesScheduleJson},
+			</if>
+			<if test="userId != null">
+				user_id_ = #{userId},
+			</if>
+			<if test="remark != null">
+				remark_ = #{remark},
+			</if>
+			<if test="wfProcessId != null">
+				wf_process_id_ = #{wfProcessId},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="type != null">
+				type_ = #{type},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
 
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM teacher_leave_record WHERE id_ = #{id} 
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM teacher_leave_record WHERE id_ =
+		#{id}
 	</delete>
 
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="TeacherLeaveRecord" parameterType="map">
-        SELECT * FROM teacher_leave_record ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="TeacherLeaveRecord"
+		parameterType="map">
+		SELECT * FROM teacher_leave_record ORDER BY id_
+		<include refid="global.limit" />
+	</select>
 
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_leave_record
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		teacher_leave_record
 	</select>
 </mapper>

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

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.VipGroupActivityDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.VipGroupActivity" id="VipGroupActivity">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="description_" property="description" />
+		<result column="vip_group_category_id_list_" property="vipGroupCategoryIdList" />
+		<result column="start_time_" property="startTime" />
+		<result column="end_time_" property="endTime" />
+		<result column="organ_id_" property="organId" />
+		<result column="courses_start_time_" property="coursesStartTime" />
+		<result column="courses_end_time_" property="coursesEndTime" />
+		<result column="type_" property="type" />
+		<result column="attribute1_" property="attribute1" />
+		<result column="attribute2_" property="attribute2" />
+		<result column="attribute3_" property="attribute3" />
+		<result column="salary_readonly_flag_" property="salaryReadonlyFlag" />
+		<result column="give_class_pay_salary_flag_" property="giveClassPaySalaryFlag" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="salary_settlement_json_" property="salarySettlementJson" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="VipGroupActivity" >
+		SELECT * FROM vip_group_activity WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="VipGroupActivity">
+		SELECT * FROM vip_group_activity ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_) VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},#{createTime},#{updateTime},#{salarySettlementJson})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroupActivity">
+		UPDATE vip_group_activity <set>
+<if test="salaryReadonlyFlag != null">
+salary_readonly_flag_ = #{salaryReadonlyFlag},
+</if>
+<if test="organId != null">
+organ_id_ = #{organId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="giveClassPaySalaryFlag != null">
+give_class_pay_salary_flag_ = #{giveClassPaySalaryFlag},
+</if>
+<if test="coursesEndTime != null">
+courses_end_time_ = #{coursesEndTime},
+</if>
+<if test="attribute1 != null">
+attribute1_ = #{attribute1},
+</if>
+<if test="endTime != null">
+end_time_ = #{endTime},
+</if>
+<if test="attribute2 != null">
+attribute2_ = #{attribute2},
+</if>
+<if test="name != null">
+name_ = #{name},
+</if>
+<if test="startTime != null">
+start_time_ = #{startTime},
+</if>
+<if test="attribute3 != null">
+attribute3_ = #{attribute3},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+<if test="vipGroupCategoryIdList != null">
+vip_group_category_id_list_ = #{vipGroupCategoryIdList},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="description != null">
+description_ = #{description},
+</if>
+<if test="salarySettlementJson != null">
+salary_settlement_json_ = #{salarySettlementJson},
+</if>
+<if test="coursesStartTime != null">
+courses_start_time_ = #{coursesStartTime},
+</if>
+<if test="type != null">
+type_ = #{type},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM vip_group_activity WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="VipGroupActivity" parameterType="map">
+		SELECT * FROM vip_group_activity ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM vip_group_activity
+	</select>
+</mapper>

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

@@ -1,80 +1,86 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.biz.dal.dao.VipGroupCategoryDao">
-	
-	<resultMap type="com.ym.mec.biz.dal.entity.VipGroupCategory" id="VipGroupCategory">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.VipGroupCategory"
+		id="VipGroupCategory">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
-		<result column="online_classes_salary_" property="onlineClassesSalary" />
-		<result column="offline_classes_salary_" property="offlineClassesSalary" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="single_class_minutes_" property="singleClassMinutes" />
+		<result column="student_num_" property="studentNum" />
 	</resultMap>
-	
+
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VipGroupCategory" >
-		SELECT * FROM vip_group_category WHERE id_ = #{id} 
+	<select id="get" resultMap="VipGroupCategory">
+		SELECT * FROM
+		vip_group_category WHERE id_ = #{id}
 	</select>
-	
+
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupCategory">
-		SELECT * FROM vip_group_category ORDER BY id_
+		SELECT * FROM vip_group_category
+		ORDER BY id_
 	</select>
-	
+
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupCategory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO vip_group_category (id_,name_,online_classes_salary_,offline_classes_salary_,del_flag_,create_time_,update_time_) VALUES(#{id},#{name},#{onlineClassesSalary},#{offlineClassesSalary},#{delFlag},#{createTime},#{updateTime})
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupCategory"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO vip_group_category
+		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_)
+		VALUES(#{id},#{name},#{delFlag},#{createTime},#{updateTime},#{singleClassMinutes},#{studentNum})
 	</insert>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroupCategory">
-		UPDATE vip_group_category <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="onlineClassesSalary != null">
-online_classes_salary_ = #{onlineClassesSalary},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="offlineClassesSalary != null">
-offline_classes_salary_ = #{offlineClassesSalary},
-</if>
-<if test="name != null">
-name_ = #{name},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
+		UPDATE vip_group_category
+		<set>
+			<if test="delFlag != null">
+				del_flag_ = #{delFlag},
+			</if>
+			<if test="studentNum != null">
+				student_num_ = #{studentNum},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="singleClassMinutes != null">
+				single_class_minutes_ = #{singleClassMinutes},
+			</if>
+			<if test="name != null">
+				name_ = #{name},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
 	</update>
-	
+
 	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM vip_group_category WHERE id_ = #{id} 
+	<delete id="delete">
+		DELETE FROM vip_group_category WHERE id_ =
+		#{id}
 	</delete>
-	
+
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VipGroupCategory" parameterType="map">
-		SELECT * FROM vip_group_category ORDER BY id_ <include refid="global.limit"/>
+	<select id="queryPage" resultMap="VipGroupCategory"
+		parameterType="map">
+		SELECT * FROM vip_group_category ORDER BY id_
+		<include refid="global.limit" />
 	</select>
-	
+
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_category
+		SELECT COUNT(*) FROM
+		vip_group_category
 	</select>
 </mapper>

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

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.VipGroupDefaultClassesCycleDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle" id="VipGroupDefaultClassesCycle">
+		<result column="id_" property="id" />
+		<result column="min_class_times_" property="minClassTimes" />
+		<result column="max_class_times_" property="maxClassTimes" />
+		<result column="month_" property="month" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="VipGroupDefaultClassesCycle" >
+		SELECT * FROM vip_group_default_classes_cycle WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="VipGroupDefaultClassesCycle">
+		SELECT * FROM vip_group_default_classes_cycle ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle">
+		UPDATE vip_group_default_classes_cycle <set>
+<if test="maxClassTimes != null">
+max_class_times_ = #{maxClassTimes},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="minClassTimes != null">
+min_class_times_ = #{minClassTimes},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="month != null">
+month_ = #{month},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM vip_group_default_classes_cycle WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="VipGroupDefaultClassesCycle" parameterType="map">
+		SELECT * FROM vip_group_default_classes_cycle ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM vip_group_default_classes_cycle
+	</select>
+</mapper>

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice" id="VipGroupDefaultClassesUnitPrice">
+		<result column="id_" property="id" />
+		<result column="organ_id_" property="organId" />
+		<result column="vip_group_category_id_" property="vipGroupCategoryId" />
+		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
+		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="VipGroupDefaultClassesUnitPrice" >
+		SELECT * FROM vip_group_default_classes_unit_price_ WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="VipGroupDefaultClassesUnitPrice">
+		SELECT * FROM vip_group_default_classes_unit_price_ ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice">
+		UPDATE vip_group_default_classes_unit_price_ <set>
+<if test="organId != null">
+organ_id_ = #{organId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="offlineClassesUnitPrice != null">
+offline_classes_unit_price_ = #{offlineClassesUnitPrice},
+</if>
+<if test="onlineClassesUnitPrice != null">
+online_classes_unit_price_ = #{onlineClassesUnitPrice},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="vipGroupCategoryId != null">
+vip_group_category_id_ = #{vipGroupCategoryId},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM vip_group_default_classes_unit_price_ WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="VipGroupDefaultClassesUnitPrice" parameterType="map">
+		SELECT * FROM vip_group_default_classes_unit_price_ ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM vip_group_default_classes_unit_price_
+	</select>
+</mapper>