diff --git a/src/com/api/organization/web/ImportCommonController.java b/src/com/api/organization/web/ImportCommonController.java
new file mode 100644
index 00000000..141fe6d3
--- /dev/null
+++ b/src/com/api/organization/web/ImportCommonController.java
@@ -0,0 +1,12 @@
+package com.api.organization.web;
+
+import javax.ws.rs.Path;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/06/29
+ * @version: 1.0
+ */
+@Path("/bs/hrmorganization/commonimport")
+public class ImportCommonController extends com.engine.organization.web.ImportCommonController {
+}
diff --git a/src/com/engine/organization/entity/hrmresource/param/HrmResourceImportParam.java b/src/com/engine/organization/entity/hrmresource/param/HrmResourceImportParam.java
new file mode 100644
index 00000000..ea110eaf
--- /dev/null
+++ b/src/com/engine/organization/entity/hrmresource/param/HrmResourceImportParam.java
@@ -0,0 +1,338 @@
+package com.engine.organization.entity.hrmresource.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/06/27
+ * @version: 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class HrmResourceImportParam {
+ /**
+ * id
+ */
+ private Long id;
+
+ /**
+ * work_code
+ */
+ private String work_code;
+
+ /**
+ * login_id
+ */
+ private String login_id;
+
+ /**
+ * last_name
+ */
+ private String last_name;
+
+ /**
+ * sex
+ */
+ private String sex;
+
+ /**
+ * account_type
+ */
+ private String account_type;
+
+ /**
+ * belong_to
+ */
+ private String belong_to;
+
+ /**
+ * company_id
+ */
+ private String company_id;
+
+ /**
+ * department_id
+ */
+ private String department_id;
+
+ /**
+ * job_activity
+ */
+ private String job_activity;
+
+ /**
+ * job_title
+ */
+ private String job_title;
+
+ /**
+ * job_call
+ */
+ private String job_call;
+
+ /**
+ * job_level
+ */
+ private String job_level;
+
+ /**
+ * job_group_id
+ */
+ private String job_group_id;
+
+ /**
+ * job_activity_desc
+ */
+ private String job_activity_desc;
+
+ /**
+ * status
+ */
+ private String status;
+
+ /**
+ * system_language
+ */
+ private String system_language;
+
+ /**
+ * resource_image_id
+ */
+ private String resource_image_id;
+
+ /**
+ * messager_url
+ */
+ private String messager_url;
+
+ /**
+ * location_id
+ */
+ private String location_id;
+
+ /**
+ * manager_id
+ */
+ private String manager_id;
+
+ /**
+ * assistant_id
+ */
+ private String assistant_id;
+
+ /**
+ * mobile
+ */
+ private String mobile;
+
+ /**
+ * telephone
+ */
+ private String telephone;
+
+ /**
+ * mobile_call
+ */
+ private String mobile_call;
+
+ /**
+ * fax
+ */
+ private String fax;
+
+ /**
+ * email
+ */
+ private String email;
+
+ /**
+ * workroom
+ */
+ private String workroom;
+
+ /**
+ * pass_word
+ */
+ private String pass_word;
+
+ /**
+ * sec_level
+ */
+ private String sec_level;
+
+ /**
+ * birthday
+ */
+ private String birthday;
+
+ /**
+ * folk
+ */
+ private String folk;
+
+ /**
+ * native_place
+ */
+ private String native_place;
+
+ /**
+ * reg_resident_place
+ */
+ private String reg_resident_place;
+
+ /**
+ * certificate_num
+ */
+ private String certificate_num;
+
+ /**
+ * marital_status
+ */
+ private String marital_status;
+
+ /**
+ * policy
+ */
+ private String policy;
+
+ /**
+ * be_member_date
+ */
+ private String be_member_date;
+
+ /**
+ * be_party_date
+ */
+ private String be_party_date;
+
+ /**
+ * islabouunion
+ */
+ private String islabouunion;
+
+ /**
+ * degree
+ */
+ private String degree;
+
+ /**
+ * health_info
+ */
+ private String health_info;
+
+ /**
+ * education_level
+ */
+ private String education_level;
+
+ /**
+ * height
+ */
+ private String height;
+
+ /**
+ * weight
+ */
+ private Integer weight;
+
+ /**
+ * use_kind
+ */
+ private String use_kind;
+
+ /**
+ * start_date
+ */
+ private String start_date;
+
+ /**
+ * end_date
+ */
+ private String end_date;
+
+ /**
+ * probation_end_date
+ */
+ private String probation_end_date;
+
+ /**
+ * resident_place
+ */
+ private String resident_place;
+
+ /**
+ * home_address
+ */
+ private String home_address;
+
+ /**
+ * temp_resident_number
+ */
+ private String temp_resident_number;
+
+ /**
+ * company_start_date
+ */
+ private String company_start_date;
+
+ /**
+ * work_start_date
+ */
+ private String work_start_date;
+
+ /**
+ * accum_fund_account
+ */
+ private String accum_fund_account;
+
+ /**
+ * account_name
+ */
+ private String account_name;
+
+ /**
+ * bank_id
+ */
+ private String bank_id;
+
+ /**
+ * account_id
+ */
+ private String account_id;
+
+ /**
+ * show_order
+ */
+ private Integer show_order;
+
+ /**
+ * classification
+ */
+ private String classification;
+
+ /**
+ * woprk_year
+ */
+ private String work_year;
+
+ /**
+ * company_work_year
+ */
+ private String company_work_year;
+
+ private String baseFieldsValue="";
+
+ private String baseFields="";
+
+ private Long creator;
+ private int deleteType;
+ private Date createTime;
+ private Date updateTime;
+}
diff --git a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java
index 678f639a..3245bc2c 100644
--- a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java
+++ b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java
@@ -40,7 +40,7 @@ public class HrmResourcePO {
/**
* 性别
*/
- private Integer sex;
+ private String sex;
/**
* 账号类型
@@ -75,7 +75,7 @@ public class HrmResourcePO {
/**
* 职称
*/
- private Long jobCall;
+ private Integer jobCall;
/**
* 职级
@@ -120,12 +120,12 @@ public class HrmResourcePO {
/**
* 直接上级
*/
- private Long managerId;
+ private Integer managerId;
/**
* 助理
*/
- private Long assistantId;
+ private Integer assistantId;
/**
* 移动电话
@@ -161,4 +161,175 @@ public class HrmResourcePO {
private int deleteType;
private Date createTime;
private Date updateTime;
+
+ /**
+ * 密码
+ */
+ private String passWord;
+
+ /**
+ * 安全级别
+ */
+ private Integer secLevel;
+
+ /**
+ * 出生日期
+ */
+ private String birthday;
+
+ /**
+ * 民族
+ */
+ private String folk;
+
+ /**
+ * 籍贯
+ */
+ private String nativePlace;
+
+ /**
+ * 户口
+ */
+ private String regResidentPlace;
+
+ /**
+ * 身份证号码
+ */
+ private String certificateNum;
+
+ /**
+ * 婚姻状况
+ */
+ private String maritalStatus;
+
+ /**
+ * 政治面貌
+ */
+ private String policy;
+
+ /**
+ * 入团日期
+ */
+ private String beMemberDate;
+
+ /**
+ * 入党日期
+ */
+ private String bePartyDate;
+
+ /**
+ * 工会会员
+ */
+ private String islabouunion;
+
+ /**
+ * 学位
+ */
+ private String degree;
+
+ /**
+ * 健康状况
+ */
+ private String healthInfo;
+
+ /**
+ * 学历
+ */
+ private Integer educationLevel;
+
+ /**
+ * 身高
+ */
+ private String height;
+
+ /**
+ * 体重
+ */
+ private Integer weight;
+
+ /**
+ * 用工性质
+ */
+ private Integer useKind;
+
+ /**
+ * 合同开始日期
+ */
+ private String startDate;
+
+ /**
+ * 合同结束日期
+ */
+ private String endDate;
+
+ /**
+ * 试用期结束日期
+ */
+ private String probationEndDate;
+
+ /**
+ * 现居住地
+ */
+ private String residentPlace;
+
+ /**
+ * 家庭联系方式
+ */
+ private String homeAddress;
+
+ /**
+ * 暂住证号码
+ */
+ private String tempResidentNumber;
+
+ /**
+ * 入职日期
+ */
+ private String companyStartDate;
+
+ /**
+ * 参加工作日期
+ */
+ private String workStartDate;
+
+ /**
+ * 公积金帐户
+ */
+ private String accumFundAccount;
+
+ /**
+ * 工资账号户名
+ */
+ private String accountName;
+
+ /**
+ * 工资银行
+ */
+ private Integer bankId;
+
+ /**
+ * 工资账号
+ */
+ private String accountId;
+
+ /**
+ * 显示顺序
+ */
+ private Integer showOrder;
+
+ /**
+ * 人员密级
+ */
+ private Integer classification;
+
+
+ private String workYear;
+
+
+ private String companyWorkYear;
+
+ private String baseFieldsValue="";
+
+ private String baseFields="";
+
}
diff --git a/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java b/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java
index 93de6af8..be9ffe5c 100644
--- a/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java
+++ b/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java
@@ -43,7 +43,7 @@ public class PostInfoSearchParam {
/**
* 职务分类
*/
- private Integer postId;
+ private Long postId;
/**
* 说明
*/
diff --git a/src/com/engine/organization/entity/postion/po/PostInfoPO.java b/src/com/engine/organization/entity/postion/po/PostInfoPO.java
index 6fdcf20e..ee1290c0 100644
--- a/src/com/engine/organization/entity/postion/po/PostInfoPO.java
+++ b/src/com/engine/organization/entity/postion/po/PostInfoPO.java
@@ -45,7 +45,7 @@ public class PostInfoPO {
/**
* 职务分类
*/
- private Integer postId;
+ private Long postId;
/**
* 说明
*/
diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml
index d22ac668..ad99cb0a 100644
--- a/src/com/engine/organization/mapper/comp/CompMapper.xml
+++ b/src/com/engine/organization/mapper/comp/CompMapper.xml
@@ -135,7 +135,9 @@
#{description},
0,
- #{showOrder},
+
+ #{showOrder},
+
diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java
new file mode 100644
index 00000000..97f2b629
--- /dev/null
+++ b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java
@@ -0,0 +1,12 @@
+package com.engine.organization.mapper.hrmresource;
+
+/**
+ * @description:
+ * @author:dxfeng
+ * @createTime: 2022/05/20
+ * @version: 1.0
+ */
+public interface HrmResourceMapper {
+
+ Long getMaxId();
+}
diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml
new file mode 100644
index 00000000..623d442e
--- /dev/null
+++ b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ t.id
+ , t.creator
+ , t.delete_type
+ , t.create_time
+ , t.update_time
+
+
+
+
\ No newline at end of file
diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.java b/src/com/engine/organization/mapper/post/PostInfoMapper.java
index 9beeb3f8..8bb8b1d4 100644
--- a/src/com/engine/organization/mapper/post/PostInfoMapper.java
+++ b/src/com/engine/organization/mapper/post/PostInfoMapper.java
@@ -25,8 +25,11 @@ public interface PostInfoMapper {
*/
List listByNo(@Param("postInfoNo") String postInfoNo);
+ PostInfoPO getPostInfoByNameAndPostId(@Param("postInfoName") String postInfoName, @Param("postId") Long postId);
+
/**
* 获取职务信息根据ID
+ *
* @param id
* @return
*/
@@ -39,10 +42,11 @@ public interface PostInfoMapper {
* @return
*/
@MapKey("id")
- List