zouxuan 5 gadi atpakaļ
vecāks
revīzija
c8313e428b

+ 20 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -71,6 +71,26 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "角色id列表",required = false)
 	private List<Integer> roleIds;
 
+	private String contactAddress;
+
+	private String postalCode;
+
+	public String getContactAddress() {
+		return contactAddress;
+	}
+
+	public void setContactAddress(String contactAddress) {
+		this.contactAddress = contactAddress;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
 	public List<Integer> getRoleIds() {
 		return roleIds;
 	}

+ 12 - 2
mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -21,6 +21,8 @@
         <result column="create_time_" property="createTime"/>
         <result column="introduction_" property="introduction"/>
         <result column="demission_date_" property="demissionDate"/>
+        <result column="contact_address_" property="contactAddress"/>
+        <result column="postal_code_" property="postalCode"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
@@ -66,8 +68,10 @@
         </selectKey>
         -->
         INSERT INTO employee
-        (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_)
-        VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate})
+        (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
+        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_)
+        VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
+        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode})
     </insert>
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values
@@ -84,6 +88,12 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Employee">
         UPDATE employee
         <set>
+            <if test="contactAddress != null">
+                contact_address_ = #{contactAddress},
+            </if>
+            <if test="postalCode != null">
+                postal_code_ = #{postalCode},
+            </if>
             <if test="isProbationPeriod != null">
                 is_probation_period_ = #{isProbationPeriod},
             </if>