Bladeren bron

衔接老师群聊部分

zouxuan 4 jaren geleden
bovenliggende
commit
3cf626fd53

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

@@ -64,6 +64,12 @@ public class MusicGroup {
 	/** 教务老师 */
 	@ApiModelProperty(value = "教务老师编号",required = false)
 	private Integer educationalTeacherId;
+
+	@ApiModelProperty(value = "衔接老师名字",required = false)
+	private String transactionTeacherName;
+
+	@ApiModelProperty(value = "衔接老师编号",required = false)
+	private Integer transactionTeacherId;
 	
 	/** 收费类型 */
 	@ApiModelProperty(value = "收费类型",required = false)
@@ -177,6 +183,22 @@ public class MusicGroup {
 	@ApiModelProperty(value = "进行中,缴费按钮控制",required = true)
 	private Boolean isRemedy = false;
 
+	public String getTransactionTeacherName() {
+		return transactionTeacherName;
+	}
+
+	public void setTransactionTeacherName(String transactionTeacherName) {
+		this.transactionTeacherName = transactionTeacherName;
+	}
+
+	public Integer getTransactionTeacherId() {
+		return transactionTeacherId;
+	}
+
+	public void setTransactionTeacherId(Integer transactionTeacherId) {
+		this.transactionTeacherId = transactionTeacherId;
+	}
+
 	public String getRepairUserName() {
 		return repairUserName;
 	}

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

@@ -12,6 +12,7 @@
         <result column="pre_apply_expire_date_" property="preApplyExpireDate"/>
         <result column="team_teacher_id_" property="teamTeacherId"/>
         <result column="educational_teacher_id_" property="educationalTeacherId"/>
+        <result column="transaction_teacher_id_" property="transactionTeacherId"/>
         <result column="charge_type_id_" property="chargeTypeId"/>
         <result column="course_form_" property="courseForm"/>
         <result column="create_time_" property="createTime"/>
@@ -73,7 +74,7 @@
          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_, expect_start_group_date_,
-         ownership_type_, repair_user_id_, del_flag_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,course_view_type_)
+         ownership_type_, repair_user_id_, del_flag_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,course_view_type_,transaction_teacher_id_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate},#{preApplyExpireDate}, #{teamTeacherId}, #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
                 #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{billStartDate},
@@ -83,7 +84,8 @@
                 #{cooperationOrganId}, #{enlightenmentCourseTime}, #{parentMeetingTime}, #{img}, #{directorUserId},
                 #{isClassroomLessons}, #{memo}, #{expectStartGroupDate},
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
-                #{delFlag},#{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+                #{delFlag},#{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},
+                #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transactionTeacherId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -119,6 +121,9 @@
             <if test="educationalTeacherId != null">
                 educational_teacher_id_ = #{educationalTeacherId},
             </if>
+            <if test="transactionTeacherId != null">
+                transaction_teacher_id_ = #{transactionTeacherId},
+            </if>
             <if test="enrollClasses != null">
                 enroll_classes_ = #{enrollClasses},
             </if>