add:teacher 表新增字段

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

@@ -16,8 +16,11 @@ public class Teacher {
 	/** 职务类型（指导老师、教务老师、教学主管） */
 	private String jobType;
 	
-	/** 工作性质（兼职、兼职试用、全职、全职试用） */
-	private String jobCategory;
+	/** 工作性质（兼职、全职） */
+	private String jobNature;
+	
+	/** 是否试用期 */
+	private Boolean isProbationPeriod;
 	
 	/** 学历 */
 	private String educationBackground;
@@ -76,14 +79,22 @@ public class Teacher {
 		return this.jobType;
 	}
 			
-	public void setJobCategory(String jobCategory){
-		this.jobCategory = jobCategory;
+	public String getJobNature() {
+		return jobNature;
 	}
-	
-	public String getJobCategory(){
-		return this.jobCategory;
+
+	public void setJobNature(String jobNature) {
+		this.jobNature = jobNature;
 	}
-			
+
+	public Boolean getIsProbationPeriod() {
+		return isProbationPeriod;
+	}
+
+	public void setIsProbationPeriod(Boolean isProbationPeriod) {
+		this.isProbationPeriod = isProbationPeriod;
+	}
+
 	public void setEducationBackground(String educationBackground){
 		this.educationBackground = educationBackground;
 	}

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

@@ -10,7 +10,8 @@
         <result column="user_id_" property="userId"/>
         <result column="organ_id_" property="organId"/>
         <result column="job_type_" property="jobType"/>
-        <result column="job_category_" property="jobCategory"/>
+        <result column="job_nature_" property="jobNature"/>
+        <result column="is_probation_period_" property="isProbationPeriod"/>
         <result column="education_background_" property="educationBackground"/>
         <result column="graduate_school_" property="graduateSchool"/>
         <result column="technical_titles_" property="technicalTitles"/>
@@ -43,8 +44,8 @@
         </selectKey>
         -->
         INSERT INTO teacher
-        (user_id_,organ_id_,job_type_,job_category_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,certificate_type_,certificate_num_,flow_organ_range_,update_time_,create_time_)
-        VALUES(#{userId},#{organId},#{jobType},#{jobCategory},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
+        (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_,update_time_,create_time_)
+        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -75,8 +76,11 @@
             <if test="certificateType != null">
                 certificate_type_ = #{certificateType},
             </if>
-            <if test="jobCategory != null">
-                job_category_ = #{jobCategory},
+            <if test="jobNature != null">
+                job_nature_ = #{jobNature},
+            </if>
+            <if test="isProbationPeriod != null">
+                is_probation_period_ = #{isProbationPeriod},
             </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},