瀏覽代碼

修改员工,同步至OA,支出多组织,多职位

river 4 年之前
父節點
當前提交
1f4b479093

+ 22 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -60,6 +60,12 @@ public class EmployeeDto {
 
 
     private String postalCode;
     private String postalCode;
 
 
+    @ApiModelProperty(value = "OA部门ids",required = false)
+    private String deptIds;
+
+    @ApiModelProperty(value = "OA岗位ids",required = false)
+    private String postIds;
+
     public String getOrganIdStr() {
     public String getOrganIdStr() {
         return organIdStr;
         return organIdStr;
     }
     }
@@ -187,4 +193,20 @@ public class EmployeeDto {
     public void setDemissionDate(Date demissionDate) {
     public void setDemissionDate(Date demissionDate) {
         this.demissionDate = demissionDate;
         this.demissionDate = demissionDate;
     }
     }
+
+    public String getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(String deptIds) {
+        this.deptIds = deptIds;
+    }
+
+    public String getPostIds() {
+        return postIds;
+    }
+
+    public void setPostIds(String postIds) {
+        this.postIds = postIds;
+    }
 }
 }

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -197,6 +197,8 @@
         <result property="contactAddress" column="contact_address_"/>
         <result property="contactAddress" column="contact_address_"/>
         <result property="postalCode" column="postal_code_"/>
         <result property="postalCode" column="postal_code_"/>
         <result property="organIdStr" column="organ_id_str_"/>
         <result property="organIdStr" column="organ_id_str_"/>
+        <result property="deptIds" column="dept_ids_"/>
+        <result property="postIds" column="post_ids_"/>
         <collection property="roleNames" ofType="string" javaType="list">
         <collection property="roleNames" ofType="string" javaType="list">
             <result column="role_name_"/>
             <result column="role_name_"/>
         </collection>
         </collection>
@@ -207,7 +209,7 @@
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
-        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_
+        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_,e.dept_ids_,e.post_ids_
         FROM employee e
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
         <if test="roleId != null">
         <if test="roleId != null">