update:新建乐团增加字段

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

@@ -234,6 +234,15 @@ public class MusicGroup extends BaseEntity {
 	@ApiModelProperty(value = "毕业年级",required = false)
 	private Integer graduateGrade;
 	
+	@ApiModelProperty(value = "学生基数",required = false)
+	private Integer basicStudentNum;
+	
+	@ApiModelProperty(value = "缴费方(学生、学校、第三方)",required = false)
+	private String paymentUserType;
+	
+	@ApiModelProperty(value = "计费方式（缴费方为第三方或学校时，选择学员计费、老师计费）",required = false)
+	private String chargeMode;
+	
 	public String getMusicalInstrumentsProvideTime() {
 		return musicalInstrumentsProvideTime;
 	}
@@ -811,4 +820,28 @@ public class MusicGroup extends BaseEntity {
 	public void setGraduateGrade(Integer graduateGrade) {
 		this.graduateGrade = graduateGrade;
 	}
+
+	public Integer getBasicStudentNum() {
+		return basicStudentNum;
+	}
+
+	public void setBasicStudentNum(Integer basicStudentNum) {
+		this.basicStudentNum = basicStudentNum;
+	}
+
+	public String getPaymentUserType() {
+		return paymentUserType;
+	}
+
+	public void setPaymentUserType(String paymentUserType) {
+		this.paymentUserType = paymentUserType;
+	}
+
+	public String getChargeMode() {
+		return chargeMode;
+	}
+
+	public void setChargeMode(String chargeMode) {
+		this.chargeMode = chargeMode;
+	}
 }

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

@@ -57,6 +57,9 @@
         <result column="course_plan_" property="coursePlan"/>
         <result column="sale_activity_desc_" property="saleActivityDesc"/>
         <result column="graduate_grade_" property="graduateGrade"/>
+        <result column="basic_student_num_" property="basicStudentNum"/>
+        <result column="payment_user_type_" property="paymentUserType"/>
+        <result column="charge_mode_" property="chargeMode"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -117,7 +120,7 @@
                  parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
                  ownership_type_, repair_user_id_, del_flag_, payment_valid_start_date_, payment_valid_end_date_,
                  payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_,is_give_accessories_,extracurricular_teacher_,first_course_start_time_,
-                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_)
+                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_,basic_student_num_,payment_user_type_,charge_mode_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
@@ -131,7 +134,7 @@
                 #{delFlag}, #{paymentValidStartDate}, #{paymentValidEndDate}, #{paymentPattern},
                 #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId},#{homeworkPushFlag},#{memberCourseShowFlag},#{tenantId},#{isGiveAccessories},
                 #{extracurricularTeacher,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{firstCourseStartTime},
-                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade})
+                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade},#{basicStudentNum},#{paymentUserType},#{chargeMode})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -276,6 +279,15 @@
             <if test="graduateGrade != null">
                 graduate_grade_ = #{graduateGrade},
             </if>
+            <if test="basicStudentNum != null">
+                basic_student_num_ = #{basicStudentNum},
+            </if>
+            <if test="paymentUserType != null">
+                payment_user_type_ = #{paymentUserType},
+            </if>
+            <if test="chargeMode != null">
+                charge_mode_ = #{chargeMode},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>