From c14286bf949602022d0f020ea6ff5b60596f0a53 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 29 Jun 2022 14:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HrmResourceImportAdaptServiceImpl.java    | 21 +++++++++++--------
 .../HrmResourceImportProcessServiceImpl.java  |  7 ++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/com/engine/organization/service/impl/HrmResourceImportAdaptServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceImportAdaptServiceImpl.java
index c090a6ee..8e81c05d 100644
--- a/src/com/engine/organization/service/impl/HrmResourceImportAdaptServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceImportAdaptServiceImpl.java
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -168,11 +169,13 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
             deleteFile();
             return errorInfo;
         } catch (NegativeArraySizeException e) {
-            errorInfo.add(SystemEnv.getHtmlLabelName(83615, userlanguage));//目前尚不清楚，这种异常的产生原因
+            //目前尚不清楚，这种异常的产生原因
+            errorInfo.add(SystemEnv.getHtmlLabelName(83615, userlanguage));
             new BaseBean().writeLog(e);
             return errorInfo;
         } catch (Exception e) {
-            errorInfo.add(SystemEnv.getHtmlLabelName(83617, userlanguage));//Excel导入错误，请阅读注意事项并检查模板文件
+            //Excel导入错误，请阅读注意事项并检查模板文件
+            errorInfo.add(SystemEnv.getHtmlLabelName(83617, userlanguage));
             new BaseBean().writeLog(e);
             return errorInfo;
         }
@@ -662,7 +665,7 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
                     }
 
                 } else if (valType.equals("isDouble")) {
-                    if (!isDecimal(cellValue)) {
+                    if (isDecimal(cellValue)) {
                         msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
                         errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83637, userlanguage));
                         return false;
@@ -720,7 +723,7 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
         }
         //身高、体重数据格式验证、大于0验证
         if ((fieldName.equals("height") || fieldName.equals("weight")) && !cellValue.equals("")) {
-            if (!isDecimal(cellValue)) {
+            if (isDecimal(cellValue)) {
                 msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
                 errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83650, userlanguage));
                 return false;
@@ -1031,16 +1034,16 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
     //浮点数判断
     public boolean isDecimal(String str) {
         if (str == null || "".equals(str))
-            return false;
-        Pattern pattern = Pattern.compile("[0-9]*(\\.?)[0-9]*");
-        return pattern.matcher(str).matches();
+            return true;
+        Pattern pattern = Pattern.compile("\\d*(\\.?)\\d*");
+        return !pattern.matcher(str).matches();
     }
 
     //整数判断
     public boolean isInteger(String str) {
         if (str == null)
             return false;
-        Pattern pattern = Pattern.compile("[0-9]+");
+        Pattern pattern = Pattern.compile("\\d+");
         return pattern.matcher(str).matches();
     }
 
@@ -1055,7 +1058,7 @@ public class HrmResourceImportAdaptServiceImpl extends Service implements HrmRes
             if (str == null)
                 return 0;
             else
-                return new String(str.getBytes("gb2312"), "iso-8859-1").length();
+                return new String(str.getBytes("gb2312"), StandardCharsets.ISO_8859_1).length();
         } catch (Exception e) {
             new BaseBean().writeLog(e);
             return 0;
diff --git a/src/com/engine/organization/service/impl/HrmResourceImportProcessServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceImportProcessServiceImpl.java
index 242f9dcb..e3654fdb 100644
--- a/src/com/engine/organization/service/impl/HrmResourceImportProcessServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceImportProcessServiceImpl.java
@@ -283,8 +283,8 @@ public class HrmResourceImportProcessServiceImpl extends Service implements HrmR
             HrmResourcePO hrmResourcePO;
             for (Object o : keyArray) {
                 obj = o.toString();
-                hrmResourceImportParam = hrMap.get(obj.toString());
-                key = (String) obj;
+                hrmResourceImportParam = hrMap.get(obj);
+                key = obj;
                 hrmResourcePO = new HrmResourcePO();
                 this.rowNum++;
                 try {  // 异常处理
@@ -1775,9 +1775,6 @@ public class HrmResourceImportProcessServiceImpl extends Service implements HrmR
             case "试用":
                 statusid = 0;
                 break;
-            case "正式":
-                statusid = 1;
-                break;
             case "临时":
                 statusid = 2;
                 break;