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

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

@@ -13,49 +13,52 @@ import com.ym.mec.web.dal.enums.YesOrNoEnum;
 public class ClassGroup {
 
 	/**  */
-	@ApiModelProperty(value = "班级编号",required = false)
+	@ApiModelProperty(value = "班级编号", required = false)
 	private Integer id;
-	
+
 	/**  */
-	@ApiModelProperty(value = "乐团编号",required = true)
+	@ApiModelProperty(value = "乐团编号", required = true)
 	private Integer musicGroupId;
-	
+
 	/**  */
-	@ApiModelProperty(value = "科目编号(多个,号分割)",required = true)
+	@ApiModelProperty(value = "科目编号(多个,号分割)", required = true)
 	private String subjectIdList;
 
-	@ApiModelProperty(value = "学生编号(多个,号分割)",required = true)
+	@ApiModelProperty(value = "学生编号(多个,号分割)", required = true)
 	private String userIds;
 
-	@ApiModelProperty(value = "科目名称",required = false,hidden = true)
+	@ApiModelProperty(value = "科目名称", required = false, hidden = true)
 	private String subjectName;
 
 	/** 班级名称 */
-	@ApiModelProperty(value = "班级名称",required = true)
+	@ApiModelProperty(value = "班级名称", required = true)
 	private String name;
 
 	/** 子班级名称列表 */
 	@ApiModelProperty(value = "子班班级名称")
 	private String classNames;
-	
+
 	/** 学生数 */
-	@ApiModelProperty(value = "学生数量",required = false)
+	@ApiModelProperty(value = "学生数量", required = false)
 	private Integer studentNum;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
+
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = true)
+	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)", required = true)
 	private ClassGroupTypeEnum type;
 
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "是否删除，1是 0否",required = false)
+	@ApiModelProperty(value = "是否删除，1是 0否", required = false)
 	private YesOrNoEnum delFlag;
 
+	@ApiModelProperty(value = "预计招生学生数量", required = false)
+	private Integer expectStudentNum;
+
 	public YesOrNoEnum getDelFlag() {
 		return delFlag;
 	}
@@ -64,22 +67,22 @@ public class ClassGroup {
 		this.delFlag = delFlag;
 	}
 
-	public void setId(Integer id){
+	public void setId(Integer id) {
 		this.id = id;
 	}
-	
-	public Integer getId(){
+
+	public Integer getId() {
 		return this.id;
 	}
-			
-	public void setMusicGroupId(Integer musicGroupId){
+
+	public void setMusicGroupId(Integer musicGroupId) {
 		this.musicGroupId = musicGroupId;
 	}
-	
-	public Integer getMusicGroupId(){
+
+	public Integer getMusicGroupId() {
 		return this.musicGroupId;
 	}
-			
+
 	public String getSubjectIdList() {
 		return subjectIdList;
 	}
@@ -88,35 +91,35 @@ public class ClassGroup {
 		this.subjectIdList = subjectIdList;
 	}
 
-	public void setName(String name){
+	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getName(){
+
+	public String getName() {
 		return this.name;
 	}
-			
-	public void setStudentNum(Integer studentNum){
+
+	public void setStudentNum(Integer studentNum) {
 		this.studentNum = studentNum;
 	}
-	
-	public Integer getStudentNum(){
+
+	public Integer getStudentNum() {
 		return this.studentNum;
 	}
-			
-	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;
 	}
 
@@ -152,10 +155,17 @@ public class ClassGroup {
 		this.classNames = classNames;
 	}
 
+	public Integer getExpectStudentNum() {
+		return expectStudentNum;
+	}
+
+	public void setExpectStudentNum(Integer expectStudentNum) {
+		this.expectStudentNum = expectStudentNum;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-
 }

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

@@ -15,6 +15,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="expect_student_num_" property="expectStudentNum"/>
         <!--<association property="musicGroupId" javaType="com.ym.mec.web.dal.entity.MusicGroup" >-->
         <!--<result column="name_" property="name"/>-->
         <!--<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>-->
@@ -47,6 +48,7 @@
             <if test="createTime!=null">create_time_,</if>
             <if test="updateTime!=null">update_time_,</if>
             <if test="type!=null">type_,</if>
+            <if test="expectStudentNum!=null">expect_student_num_,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -58,6 +60,7 @@
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">#{updateTime},</if>
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="expectStudentNum!=null">#{expectStudentNum},</if>
         </trim>
     </insert>
 
@@ -95,6 +98,9 @@
             <if test="name != null">
                 name_ = #{name},
             </if>
+            <if test="expectStudentNum != null">
+                expect_student_num_ = #{expectStudentNum},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>