yonge 5 years ago
parent
commit
df20df41e5

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

@@ -1,10 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
 /**
  * 对应数据库表(class_group):
  */
@@ -20,7 +22,7 @@ public class ClassGroup {
 	
 	/**  */
 	@ApiModelProperty(value = "科目编号",required = false)
-	private String subjectId;
+	private String subjectIdList;
 	
 	/** 班级名称 */
 	@ApiModelProperty(value = "班级名称",required = false)
@@ -68,14 +70,14 @@ public class ClassGroup {
 		return this.musicGroupId;
 	}
 			
-	public void setSubjectId(String subjectId){
-		this.subjectId = subjectId;
+	public String getSubjectIdList() {
+		return subjectIdList;
 	}
-	
-	public String getSubjectId(){
-		return this.subjectId;
+
+	public void setSubjectIdList(String subjectIdList) {
+		this.subjectIdList = subjectIdList;
 	}
-			
+
 	public void setName(String name){
 		this.name = name;
 	}

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

@@ -8,7 +8,7 @@
     <resultMap type="com.ym.mec.web.dal.entity.ClassGroup" id="ClassGroup">
         <result column="id_" property="id"/>
         <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_" property="subjectId"/>
+        <result column="subject_id_list_" property="subjectIdList"/>
         <result column="name_" property="name"/>
         <result column="student_num_" property="studentNum"/>
         <result column="create_time_" property="createTime"/>
@@ -24,7 +24,7 @@
     <resultMap type="com.ym.mec.web.dal.entity.ClassGroup4Teacher" id="ClassGroup4Teacher">
         <result column="id_" property="id"/>
         <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_" property="subjectId"/>
+        <result column="subject_id_list_" property="subjectIdList"/>
         <result column="name_" property="name"/>
         <result column="student_num_" property="studentNum"/>
         <result column="create_time_" property="createTime"/>
@@ -40,7 +40,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id!=null">id_,</if>
             <if test="musicGroupId!=null">music_group_id_,</if>
-            <if test="subjectId!=null">subject_id_,</if>
+            <if test="subjectIdList!=null">subject_id_list_,</if>
             <if test="name!=null">name_,</if>
             <if test="studentNum!=null">student_num_,</if>
             <if test="createTime!=null">create_time_,</if>
@@ -51,7 +51,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id!=null">#{id},</if>
             <if test="musicGroupId!=null">#{musicGroupId},</if>
-            <if test="subjectId!=null">#{subjectId},</if>
+            <if test="subjectIdList!=null">#{subjectIdList},</if>
             <if test="name!=null">#{name},</if>
             <if test="studentNum!=null">#{studentNum},</if>
             <if test="createTime!=null">#{createTime},</if>
@@ -74,8 +74,8 @@
     <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroup">
         UPDATE class_group
         <set>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
+            <if test="subjectIdList != null">
+                subject_id_list_ = #{subjectIdList},
             </if>
             <if test="studentNum != null">
                 student_num_ = #{studentNum},