人员导入

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="";
+
 }

src/com/engine/organization/mapper/comp/CompMapper.xml

@@ -135,7 +135,9 @@
                 #{description},
             </if>
             0,
-            #{showOrder},
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
         </trim>
     </insert>
 

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();
+}

src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.engine.organization.mapper.hrmresource.HrmResourceMapper">
+
+    <resultMap id="BaseResultMap" type="com.engine.organization.entity.hrmresource.po.HrmResourcePO">
+        <result column="id" property="id"/>
+        <result column="creator" property="creator"/>
+        <result column="delete_type" property="deleteType"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+        t.id
+        , t.creator
+        , t.delete_type
+        , t.create_time
+        , t.update_time
+    </sql>
+
+    <select id="getMaxId" resultType="java.lang.Long">
+        select max(id)
+        from jcl_org_hrmresource
+    </select>
+</mapper>

src/com/engine/organization/service/impl/HrmResourceImportAdaptServiceImpl.java

@@ -477,13 +477,13 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
                 }
                 String val = "";
                 switch (key) {
-                    case "loginid":
+                    case "login_id":
                         val = importParam.getLogin_id();
                         break;
-                    case "workcode":
+                    case "work_code":
                         val = importParam.getWork_code();
                         break;
-                    case "certificatenum":
+                    case "certificate_num":
                         val = importParam.getCertificate_num();
                         break;
                 }
@@ -536,15 +536,15 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
                 String val = "";
                 String errorMsg = "";
                 switch (key) {
-                    case "loginid":
+                    case "login_id":
                         val = Util.null2String(importParam.getLogin_id()).trim();
                         errorMsg = SystemEnv.getHtmlLabelName(520127, userlanguage);
                         break;
-                    case "workcode":
+                    case "work_code":
                         val = Util.null2String(importParam.getWork_code()).trim();
                         errorMsg = SystemEnv.getHtmlLabelName(520128, userlanguage);
                         break;
-                    case "certificatenum":
+                    case "certificate_num":
                         val = Util.null2String(importParam.getCertificate_num()).trim();
                         errorMsg = SystemEnv.getHtmlLabelName(83623, userlanguage);
                         break;

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -1,6 +1,5 @@
 package com.engine.organization.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
 import com.cloudstore.eccom.result.WeaResultMsg;
@@ -267,10 +266,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             //如果读取数据和验证模板没有发生错误
             if (errorInfo.isEmpty()) {
                 Map<String, HrmResourceImportParam> hrMap = importAdapt.getHrmImportMap();
-                System.out.println(JSON.toJSON(hrMap));
+                HrmResourceImportProcessService importProcess = (HrmResourceImportProcessService) Class.forName("com.engine.organization.service.impl.HrmResourceImportProcessServiceImpl").newInstance();
-                 HrmResourceImportProcessService importProcess = (HrmResourceImportProcessService) Class.forName("com.engine.organization.service.impl.HrmResourceImportProcessServiceImpl").newInstance();
+                importProcess.init(request);
-                 importProcess.init(request);
+                importProcess.processMap(hrMap);
-                 importProcess.processMap(hrMap);
             } else {
                 if (errorInfo != null && !errorInfo.isEmpty()) {
                     Map<String, Object> error;

src/com/engine/organization/util/PageInfoSortUtil.java

@@ -21,7 +21,7 @@ public class PageInfoSortUtil {
      * @return
      */
     public static String getSortSql(String sortParams) {
-        JSONArray jsonArray  = JSONObject.parseArray(sortParams);
+        JSONArray jsonArray = JSONObject.parseArray(sortParams);
         if (CollectionUtils.isNotEmpty(jsonArray)) {
             JSONObject jsonObject = (JSONObject) jsonArray.get(0);
             String orderKey = upperCharToUnderLine(jsonObject.getString("orderkey"));
@@ -54,4 +54,28 @@ public class PageInfoSortUtil {
         }
         return builder.toString();
     }
+
+    /**
+     * 下划线转驼峰
+     *
+     * @param str
+     * @return
+     */
+    public static String underlineToHump(String str) {
+        //正则匹配下划线及后一个字符，删除下划线并将匹配的字符转成大写
+        Matcher matcher = Pattern.compile("_([a-z])").matcher(str);
+        StringBuffer sb = new StringBuffer(str);
+        if (matcher.find()) {
+            sb = new StringBuffer();
+            //将当前匹配的子串替换成指定字符串，并且将替换后的子串及之前到上次匹配的子串之后的字符串添加到StringBuffer对象中
+            //正则之前的字符和被替换的字符
+            matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
+            //把之后的字符串也添加到StringBuffer对象中
+            matcher.appendTail(sb);
+        } else {
+            //去除除字母之外的前面带的下划线
+            return sb.toString().replaceAll("_", "");
+        }
+        return underlineToHump(sb.toString());
+    }
 }