update

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

@@ -34,7 +34,7 @@ public class CourseSchedule {
 
 		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"), PRACTICE(
 				"PRACTICE", "网管课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训单技课"), TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
-				"CLASSROOM", "课堂课"),COMM("COMM","对外课程");
+				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),TRIAL("TRIAL","试听课");
 
 		private String code;
 

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

@@ -1,9 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.GroupStatusEnum;
+import java.util.Date;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.util.Date;
+import com.ym.mec.biz.dal.enums.GroupStatusEnum;
+import com.ym.mec.biz.dal.enums.PracticeGroupType;
 
 /**
  * 对应数据库表(practice_group):
@@ -19,6 +21,8 @@ public class PracticeGroup {
 	/**  */
 	private Integer subjectId;
 	
+	private PracticeGroupType type;
+	
 	/**  */
 	private Integer userId;
 
@@ -149,6 +153,14 @@ public class PracticeGroup {
 		return this.name;
 	}
 			
+	public PracticeGroupType getType() {
+		return type;
+	}
+
+	public void setType(PracticeGroupType type) {
+		this.type = type;
+	}
+
 	public void setSubjectId(Integer subjectId){
 		this.subjectId = subjectId;
 	}

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

@@ -9,6 +9,8 @@
     <resultMap type="com.ym.mec.biz.dal.entity.PracticeGroup" id="PracticeGroup">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
+        <result column="type_" property="type"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="user_id_" property="userId"/>
         <result column="student_id_" property="studentId"/>
@@ -74,6 +76,9 @@
             <if test="groupStatus!=null">
                 group_status_=#{groupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            <if test="type!=null">
+                type_ =#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="educationalTeacherId!=null">
                 educational_teacher_id_=#{educationalTeacherId},
             </if>
@@ -117,8 +122,8 @@
         </selectKey>
         -->
         INSERT INTO practice_group
-        (id_,name_,subject_id_,user_id_,student_id_,single_class_minutes_,organ_id_,courses_start_date_,courses_expire_date_,create_time_,update_time_,memo_,buy_months_,drill_times_on_week_,drill_times_json_,group_status_,be_renew_group_id_,educational_teacher_id_)
-        VALUES(#{id},#{name},#{subjectId},#{userId},#{studentId},#{singleClassMinutes},#{organId},#{coursesStartDate},#{coursesExpireDate},NOW(),NOW(),#{memo},#{buyMonths},#{drillTimesOnWeek},#{drillTimesJson},#{groupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{beRenewGroupId},#{educationalTeacherId})
+        (id_,name_,type_,subject_id_,user_id_,student_id_,single_class_minutes_,organ_id_,courses_start_date_,courses_expire_date_,create_time_,update_time_,memo_,buy_months_,drill_times_on_week_,drill_times_json_,group_status_,be_renew_group_id_,educational_teacher_id_)
+        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId},#{userId},#{studentId},#{singleClassMinutes},#{organId},#{coursesStartDate},#{coursesExpireDate},NOW(),NOW(),#{memo},#{buyMonths},#{drillTimesOnWeek},#{drillTimesJson},#{groupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{beRenewGroupId},#{educationalTeacherId})
     </insert>
 
     <select id="getUserFreePracticeGroup" resultMap="PracticeGroup">