Merge branch 'master' of https://gitee.com/zouxuan/mec

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

@@ -1,10 +1,14 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import com.ym.mec.web.dal.enums.JobNatureEnum;
 import com.ym.mec.web.dal.enums.JobTypeEnum;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * 对应数据库表(teacher):
@@ -74,6 +78,9 @@ public class Teacher {
 
 	@ApiModelProperty(value = "老师介绍", required = false)
 	private String introduction;
+	
+	@ApiModelProperty(value = "离职时间", required = false)
+	private Date demissionDate;
 
 	public void setUserId(Integer userId) {
 		this.userId = userId;
@@ -211,6 +218,14 @@ public class Teacher {
 		this.introduction = introduction;
 	}
 
+	public Date getDemissionDate() {
+		return demissionDate;
+	}
+
+	public void setDemissionDate(Date demissionDate) {
+		this.demissionDate = demissionDate;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -18,6 +18,7 @@
         <result column="work_unit_" property="workUnit"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="entry_date_" property="entryDate"/>
+        <result column="demission_date_" property="demissionDate"/>
         <result column="certificate_type_" property="certificateType"/>
         <result column="certificate_num_" property="certificateNum"/>
         <result column="flow_organ_range_" property="flowOrganRange"/>
@@ -45,8 +46,8 @@
         </selectKey>
         -->
         INSERT INTO teacher
-        (user_id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_)
-        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now())
+        (user_id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_)
+        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -68,6 +69,9 @@
             <if test="entryDate != null">
                 entry_date_ = #{entryDate},
             </if>
+            <if test="demissionDate != null">
+                demission_date_ = #{demissionDate},
+            </if>
             <if test="jobType != null">
                 job_type_ = #{jobType},
             </if>