Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroup.java

@@ -70,6 +70,12 @@ public class MusicGroup {
 	@ApiModelProperty(value = "乐团计费开始日期 ",required = false)
 	private java.util.Date billStartDate;
 	
+	@ApiModelProperty(value = "提高课班级数",required = false)
+	private Integer improventClassesNum;
+	
+	@ApiModelProperty(value = "招生年级（多个用|分开）",required = false)
+	private String enrollClasses;
+	
 	public void setId(String id){
 		this.id = id;
 	}
@@ -198,6 +204,22 @@ public class MusicGroup {
 		return this.billStartDate;
 	}
 			
+	public Integer getImproventClassesNum() {
+		return improventClassesNum;
+	}
+
+	public void setImproventClassesNum(Integer improventClassesNum) {
+		this.improventClassesNum = improventClassesNum;
+	}
+
+	public String getEnrollClasses() {
+		return enrollClasses;
+	}
+
+	public void setEnrollClasses(String enrollClasses) {
+		this.enrollClasses = enrollClasses;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-web/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -22,6 +22,8 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="payment_expire_date_" property="paymentExpireDate"/>
         <result column="bill_start_date_" property="billStartDate"/>
+        <result column="improvent_classes_num_" property="improventClassesNum"/>
+        <result column="enroll_classes_" property="enrollClasses"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -43,8 +45,8 @@
         </selectKey>
         -->
         INSERT INTO music_group
-        (id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_group_id_,class_period_,free_class_period_,create_time_,update_time_,status_,payment_expire_date_,bill_start_date_)
-        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{paymentExpireDate},#{billStartDate})
+        (id_,name_,organ_id_,school_id_,apply_expire_date_,improvent_classes_num_,enroll_classes_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_group_id_,class_period_,free_class_period_,create_time_,update_time_,status_,payment_expire_date_,bill_start_date_)
+        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{improventClassesNum},#{enrollClasses},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{paymentExpireDate},#{billStartDate})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -57,6 +59,12 @@
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
+            <if test="improventClassesNum != null">
+                improvent_classes_num_ = #{improventClassesNum},
+            </if>
+            <if test="enrollClasses != null">
+                enroll_classes_ = #{enrollClasses},
+            </if>
             <if test="chargeTypeId != null">
                 charge_type_id_ = #{chargeTypeId},
             </if>