From b9635a4f7d87fb67f8a8919cb45c519e2b081129 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 18 Jun 2020 16:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B2=BB=E7=90=86=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E3=80=91=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?-=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-06-18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java     | 2 +-
 .../esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java | 2 +-
 .../elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java  | 2 +-
 .../esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java    | 2 +-
 .../esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java
index 72b2151c8..2d04099d0 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java
@@ -155,7 +155,7 @@ public class ExcelUtils {
      * @return
      */
     public static Boolean checkNumber(String numStr){
-        Pattern pattern = Pattern.compile("([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])");
+        Pattern pattern = Pattern.compile("([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])|(0)");
         Matcher isNum = pattern.matcher(numStr);
         if( !isNum.matches() ){
             return true;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java
index 1c85b792e..6e253487a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCommunityBuildingServiceImpl.java
@@ -211,7 +211,7 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl<KpiCommunit
 
                 // 校验是否存在空单元格
                 if(checkNullCell(kpiCommunityBuildingExcel)){
-                    return new Result().error("导入文件中存在空单元格，请完善后重试!");
+                    return new Result().error("导入文件中存在空单元格或模板格式不匹配，请完善表格或核对模板是否正确!");
                 }
 
                 // 校验是否存在分数范围不正确的打分
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
index 4589a9c83..246ac69bd 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
@@ -231,7 +231,7 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
 
                 // 校验是否存在空单元格
                 if(checkNullCell(kpiGridEntityExcel)){
-                    return new Result().error("导入文件中存在空单元格，请完善后重试!");
+                    return new Result().error("导入文件中存在空单元格或模板格式不匹配，请完善表格或核对模板是否正确!");
                 }
 
                 // 校验是否存在分数范围不正确的打分
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java
index 68a07cc60..7f252943f 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMassEvaluationServiceImpl.java
@@ -231,7 +231,7 @@ public class KpiMassEvaluationServiceImpl extends BaseServiceImpl<KpiMassEvaluat
 
                 // 校验是否存在空单元格
                 if(checkNullCell(kpiMassEvaluationExcel)){
-                    return new Result().error("导入文件中存在空单元格，请完善后重试!");
+                    return new Result().error("导入文件中存在空单元格或模板格式不匹配，请完善表格或核对模板是否正确!");
                 }
 
                 // 校验是否存在分数范围不正确的打分
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java
index d2e1d2974..4bc4e8d39 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPublicOpinionServiceImpl.java
@@ -231,7 +231,7 @@ public class KpiPublicOpinionServiceImpl extends BaseServiceImpl<KpiPublicOpinio
 
                 // 校验是否存在空单元格
                 if(checkNullCell(kpiPublicOpinionExcel)){
-                    return new Result().error("导入文件中存在空单元格，请完善后重试!");
+                    return new Result().error("导入文件中存在空单元格或模板格式不匹配，请完善表格或核对模板是否正确!");
                 }
 
                 // 校验是否存在分数范围不正确的打分