!133 人员导入

Merge pull request !133 from dxfeng/feature/dxf

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

@@ -30,6 +30,21 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
 
         Map<String, Object> returnMap = new HashMap<>();
         try {
+            String keyField = (String) params.get("keyField");
+            switch (keyField) {
+                case "workcode":
+                    params.put("keyField","work_code");
+                    break;
+                case "lastname":
+                    params.put("keyField","last_name");
+                    break;
+                case "loginid":
+                    params.put("keyField","login_id");
+                    break;
+                default:
+                    break;
+
+            }
             /*综合考虑多数据源后，实现通过配置文件配置适配器和解析类*/
             List<Object> lsErrorInfo = new ArrayList<>();
             HrmResourceImportAdaptUtil importAdaptUtil = new HrmResourceImportAdaptUtil();

src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java

@@ -107,7 +107,7 @@ public class HrmResourceImportAdaptUtil {
 
     Map<String, Map<String, String>> checkInfos = new HashMap<>();
 
-    private final String[] checkKeys = new String[]{"loginid", "workcode"};
+    private final String[] checkKeys = new String[]{"login_id", "work_code"};
 
     private int accountTypeIndex = 50;
     private int accountTypeColumn = -1;
@@ -475,13 +475,13 @@ public class HrmResourceImportAdaptUtil {
                 }
                 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;
                 }
@@ -534,15 +534,15 @@ public class HrmResourceImportAdaptUtil {
                 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/util/saveimport/HrmResourceImportProcessUtil.java

@@ -71,7 +71,7 @@ public class HrmResourceImportProcessUtil {
 
     Map<String, Map<String, String>> checkInfos = new HashMap<>();
 
-    private final String[] checkKeys = new String[]{"loginid", "workcode"};
+    private final String[] checkKeys = new String[]{"login_id", "work_code"};
 
     private Map<String, JSONObject> baseTypeMap;                    //基础信息自定义字段数据库类型与字段名称映射<fieldName,dbtype>
 
@@ -140,6 +140,20 @@ public class HrmResourceImportProcessUtil {
         try {
             this.user = (User) request.getSession(true).getAttribute("weaver_user@bean");
             this.keyField = Util.null2String(request.getParameter("keyField"));
+            switch (keyField) {
+                case "workcode":
+                    keyField="work_code";
+                    break;
+                case "lastname":
+                    keyField="last_name";
+                    break;
+                case "loginid":
+                    keyField="login_id";
+                    break;
+                default:
+                    break;
+
+            }
             this.operateType = Util.null2String(request.getParameter("operateType"));
 
             ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user);
@@ -1969,13 +1983,13 @@ public class HrmResourceImportProcessUtil {
             ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user);
             String relatedName = "";
             switch (this.keyField) {
-                case "workcode":
+                case "work_code":
                     relatedName = log.getWorkCode();
                     break;
-                case "loginid":
+                case "login_id":
                     relatedName = log.getLoginid();
                     break;
-                case "lastname":
+                case "last_name":
                     relatedName = log.getLastname();
                     break;
             }
@@ -2009,15 +2023,15 @@ public class HrmResourceImportProcessUtil {
                 String val = "";
                 String errorMsg = "";
                 switch (key) {
-                    case "loginid":
+                    case "login_id":
                         val = Util.null2String(importParam.getLogin_id()).trim();
                         errorMsg = SystemEnv.getHtmlLabelName(522076, userlanguage);
                         break;
-                    case "workcode":
+                    case "work_code":
                         val = Util.null2String(importParam.getWork_code()).trim();
                         errorMsg = SystemEnv.getHtmlLabelName(520197, userlanguage);
                         break;
-                    case "certificatenum":
+                    case "certificate_num":
                         val = Util.null2String(importParam.getCertificate_num()).trim();
                         errorMsg = SystemEnv.getHtmlLabelName(83521, userlanguage);
                         break;