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

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

@@ -127,6 +127,9 @@ public class MusicGroup {
 	
 	@ApiModelProperty(value = "是否是课堂课",required = true)
 	private boolean isClassroomLessons;
+	
+	@ApiModelProperty(value = "备注",required = true)
+	private String memo;
 
 	public String getCooperationOrganName() {
 		return cooperationOrganName;
@@ -400,6 +403,14 @@ public class MusicGroup {
 		this.isClassroomLessons = isClassroomLessons;
 	}
 
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MusicGroupStatusEnum.java

@@ -3,10 +3,8 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
-	DRAFT("DRAFT","草稿"),AUDIT("AUDIT","审核中"),
-	APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"),
-	PREPARE("PREPARE", "筹备中"), PROGRESS("PROGRESS", "进行中"),
-	CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
+	DRAFT("DRAFT", "草稿"), AUDIT("AUDIT", "审核中"), AUDIT_FAILED("AUDIT_FAILED", "审核失败"), APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"), PROGRESS(
+			"PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
 
 	private String code;
 	private String msg;

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

@@ -27,6 +27,8 @@
 		<result column="img_" property="img" />
 		<result column="director_user_id_" property="directorUserId" />
 		<result column="settlement_type_" property="settlementType" />
+		<result column="is_classroom_lessons_" property="isClassroomLessons" />
+		<result column="memo_" property="memo" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -50,11 +52,11 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group
 		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,
-		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,settlement_type_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_)
+		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,settlement_type_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_,director_user_id_,is_classroom_lessons_,memo_)
 		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
 		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
 		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{settlementType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId})
+		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId},#{isClassroomLessons},#{memo})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -124,6 +126,12 @@
 			<if test="settlementType != null">
 				settlement_type_ = #{settlementType},
 			</if>
+			<if test="isClassroomLessons != null">
+				is_classroom_lessons_ = #{isClassroomLessons},
+			</if>
+			<if test="memo != null">
+				memo_ = #{memo},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>