Merge remote-tracking branch 'origin/yonge' into yonge

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

@@ -11,8 +11,8 @@
         <result column="organ_id_" property="organId"/>
         <result column="teacher_organ_id_" property="teacherOrganId"/>
         <result column="organ_name_" property="organName"/>
-        <result column="job_type_" property="jobType"/>
-        <result column="job_nature_" property="jobNature"/>
+        <result column="job_type_" property="jobType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_probation_period_" property="isProbationPeriod"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="education_background_" property="educationBackground"/>
@@ -74,7 +74,7 @@
             keyProperty="id">
         INSERT INTO teacher
         (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_,is_support_course_schedule_rewards_rules_)
-        VALUES(#{id},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules})
+        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules})
     </insert>
 
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
@@ -108,7 +108,7 @@
                 demission_date_ = #{demissionDate},
             </if>
             <if test="jobType != null">
-                job_type_ = #{jobType},
+                job_type_ = #{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="flowOrganRange != null">
                 flow_organ_range_ = #{flowOrganRange},
@@ -117,7 +117,7 @@
                 certificate_type_ = #{certificateType},
             </if>
             <if test="jobNature != null">
-                job_nature_ = #{jobNature},
+                job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="isProbationPeriod != null">
                 is_probation_period_ = #{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},