update

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

@@ -1,77 +1,104 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.common.enums.BaseEnum;
+
 /**
  * 对应数据库表(course_schedule):
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class CourseSchedule {
 
+	public enum CourseScheduleType implements BaseEnum<String, CourseScheduleType> {
+
+		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("demo", "试听课"), COMPREHENSIVE("comprehensive", "综合课"), PRACTICE(
+				"PRACTICE", "练习课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING("TRAINING", "集训课");
+
+		private String code;
+
+		private String msg;
+
+		CourseScheduleType(String code, String msg) {
+			this.code = code;
+			this.msg = msg;
+		}
+
+		@Override
+		public String getCode() {
+			return code;
+		}
+
+		public String getMsg() {
+			return msg;
+		}
+	}
+
 	/**  */
 	private Long id;
-	
+
 	/** 班级编号 */
-	@ApiModelProperty(value = "班级编号",required = false)
+	@ApiModelProperty(value = "班级编号", required = false)
 	private Integer classGroupId;
-	
+
 	/** 课程状态 */
-	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退",required = false)
+	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退", required = false)
 	private CourseStatusEnum status;
-	
+
 	/** 补贴 */
-	@ApiModelProperty(value = "补贴",required = false)
+	@ApiModelProperty(value = "补贴", required = false)
 	private long subsidy;
-	
+
 	/** 上课日期 */
-	@ApiModelProperty(value = "上课日期",required = false)
+	@ApiModelProperty(value = "上课日期", required = false)
 	private java.util.Date classDate;
-	
+
 	/** 上课时间 */
-	@ApiModelProperty(value = "上课时间",required = false)
+	@ApiModelProperty(value = "上课时间", required = false)
 	private java.util.Date startClassTime;
-	
+
 	/** 结束时间 */
-	@ApiModelProperty(value = "结束时间",required = false)
+	@ApiModelProperty(value = "结束时间", required = false)
 	private java.util.Date endClassTime;
-	
+
 	/** 上课教师 */
-	@ApiModelProperty(value = "上课教师",required = false)
+	@ApiModelProperty(value = "上课教师", required = false)
 	private Long teacherId;
-	
+
 	/** 实际上课教师 */
-	@ApiModelProperty(value = "实际上课教师",required = false)
+	@ApiModelProperty(value = "实际上课教师", required = false)
 	private Long actualTeacherId;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
 
 	private TeachModeEnum teachMode;
 
 	private boolean complaintStatus;
+	
+	private CourseScheduleType type;
 
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setClassGroupId(Integer classGroupId){
+
+	public void setClassGroupId(Integer classGroupId) {
 		this.classGroupId = classGroupId;
 	}
-	
-	public Integer getClassGroupId(){
+
+	public Integer getClassGroupId() {
 		return this.classGroupId;
 	}
 
@@ -83,35 +110,35 @@ public class CourseSchedule {
 		this.status = status;
 	}
 
-	public void setSubsidy(long subsidy){
+	public void setSubsidy(long subsidy) {
 		this.subsidy = subsidy;
 	}
-	
-	public long getSubsidy(){
+
+	public long getSubsidy() {
 		return this.subsidy;
 	}
-			
-	public void setClassDate(java.util.Date classDate){
+
+	public void setClassDate(java.util.Date classDate) {
 		this.classDate = classDate;
 	}
-	
-	public java.util.Date getClassDate(){
+
+	public java.util.Date getClassDate() {
 		return this.classDate;
 	}
-			
-	public void setStartClassTime(java.util.Date startClassTime){
+
+	public void setStartClassTime(java.util.Date startClassTime) {
 		this.startClassTime = startClassTime;
 	}
-	
-	public java.util.Date getStartClassTime(){
+
+	public java.util.Date getStartClassTime() {
 		return this.startClassTime;
 	}
-			
-	public void setEndClassTime(java.util.Date endClassTime){
+
+	public void setEndClassTime(java.util.Date endClassTime) {
 		this.endClassTime = endClassTime;
 	}
-	
-	public java.util.Date getEndClassTime(){
+
+	public java.util.Date getEndClassTime() {
 		return this.endClassTime;
 	}
 
@@ -131,19 +158,19 @@ public class CourseSchedule {
 		this.actualTeacherId = actualTeacherId;
 	}
 
-	public void setCreateTime(java.util.Date createTime){
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	public java.util.Date getUpdateTime() {
 		return this.updateTime;
 	}
 
@@ -163,6 +190,14 @@ public class CourseSchedule {
 		this.complaintStatus = complaintStatus;
 	}
 
+	public CourseScheduleType getType() {
+		return type;
+	}
+
+	public void setType(CourseScheduleType type) {
+		this.type = type;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,13 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.math.BigDecimal;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 /**
  * 对应数据库表(teacher_default_music_group_salary):
@@ -21,9 +21,9 @@ public class TeacherDefaultMusicGroupSalary {
 	@ApiModelProperty(value = "教师编号",required = false)
 	private Integer userId;
 	
-	/** 班级类型（参照 class_group表的type_字段） */
-	@ApiModelProperty(value = "班级类型",required = false)
-	private ClassGroupTypeEnum classGroupType;
+	/** 班级类型（参照 course_schedule表的type_字段） */
+	@ApiModelProperty(value = "课程类型",required = false)
+	private CourseScheduleType courseScheduleType;
 	
 	/**  */
 	@ApiModelProperty(value = "专业技能",required = false)
@@ -70,12 +70,12 @@ public class TeacherDefaultMusicGroupSalary {
 		return this.userId;
 	}
 
-	public ClassGroupTypeEnum getClassGroupType() {
-		return classGroupType;
+	public CourseScheduleType getCourseScheduleType() {
+		return courseScheduleType;
 	}
 
-	public void setClassGroupType(ClassGroupTypeEnum classGroupType) {
-		this.classGroupType = classGroupType;
+	public void setCourseScheduleType(CourseScheduleType courseScheduleType) {
+		this.courseScheduleType = courseScheduleType;
 	}
 
 	public void setSubjectId(Integer subjectId){

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

@@ -19,6 +19,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="complaint_status_" property="complaintStatus"/>
     </resultMap>
 
@@ -50,16 +51,16 @@
         </selectKey>
         -->
         INSERT INTO course_schedule
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
-        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now())
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_)
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         INSERT INTO course_schedule
-        (class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
+        (class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now())
+            (#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
 
@@ -76,6 +77,9 @@
             <if test="status != null">
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="actualTeacherId != null">
                 actual_teacher_id_ = #{actualTeacherId},
             </if>

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

@@ -7,7 +7,7 @@
 		id="TeacherDefaultMusicGroupSalary">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
-		<result column="class_group_type_" property="classGroupType" />
+		<result column="course_schedule_type_" property="courseScheduleType" />
 		<result column="subject_id_" property="subjectId" />
 		<result column="main_teacher_salary_" property="mainTeacherSalary" />
 		<result column="assistant_teacher_salary_" property="assistantTeacherSalary" />
@@ -33,8 +33,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_default_music_group_salary
-		(id_,user_id_,class_group_type_,subject_id_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{classGroupType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
+		(id_,user_id_,course_schedule_type_,subject_id_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{courseScheduleType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -51,8 +51,8 @@
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
 			</if>
-			<if test="classGroupType != null">
-				class_group_type_ = #{classGroupType},
+			<if test="courseScheduleType != null">
+				course_schedule_type_ = #{courseScheduleType},
 			</if>
 			<if test="mainTeacherSalary != null">
 				main_teacher_salary_ = #{mainTeacherSalary},
@@ -85,6 +85,6 @@
 
 	<!-- 根据user_id 获取老师的默认薪酬 -->
 	<select id="getTeacherSalaryByUserIdAndType" resultMap="TeacherDefaultMusicGroupSalary">
-		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND class_group_type_ = #{classGroupType}
+		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND course_schedule_type_ = #{courseScheduleType}
 	</select>
 </mapper>