From fae77c884ef4f9d71db39aedbe0aed1e7746feea Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 3 Mar 2021 11:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E4=BF=AE=E6=94=B9=E3=80=91-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-03-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/entity/KpiGridEntityEntity.java |  9 +++++++--
 .../elink/esua/epdc/excel/KpiGridEntityExcel.java   |  5 ++++-
 .../epdc/service/impl/KpiGridEntityServiceImpl.java | 13 +++++++++++--
 .../src/main/resources/mapper/KpiGridEntityDao.xml  |  3 ++-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
index cea570d54..7502623a9 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
@@ -63,7 +63,7 @@ public class KpiGridEntityEntity extends BaseEpdcEntity {
 	/**
 	 * 建站达标-边界
 	 */
-	private String stationEstablishmentBorder;
+	private String  stationEstablishmentBorder;
 
 	/**
 	 * 建站达标-布局
@@ -130,4 +130,9 @@ public class KpiGridEntityEntity extends BaseEpdcEntity {
      */
 	private String allDeptNames;
 
-}
\ No newline at end of file
+	/**
+	 * 奖励分值
+	 */
+	private String plusScore;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java
index 62aafa753..9c9273d6a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java
@@ -77,6 +77,9 @@ public class KpiGridEntityExcel {
     @Excel(name = "运行机制分数")
     private String gridOperationOperational;
 
+    @Excel(name = "奖励分值")
+    private String plusScore;
+
 //    @Excel(name = "上级部门id")
 //    private String parentDeptIds;
 //
@@ -108,4 +111,4 @@ public class KpiGridEntityExcel {
 //    private String delFlag;
 
 
-}
\ No newline at end of file
+}
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 786fe0060..120b1262a 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
@@ -366,7 +366,7 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
                 || StringUtils.isBlank(kpiGridEntityExcel.getStationEstablishmentStandard()) || StringUtils.isBlank(kpiGridEntityExcel.getDeptTypeKey())
                 || StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacementInformation()) || StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacementOfficer())
                 || StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacementPersonnel()) || StringUtils.isBlank(kpiGridEntityExcel.getGridOperationOperational())
-                || StringUtils.isBlank(kpiGridEntityExcel.getGridOperationWorkplan())){
+                || StringUtils.isBlank(kpiGridEntityExcel.getGridOperationWorkplan()) || StringUtils.isBlank(kpiGridEntityExcel.getPlusScore())){
             return true;
         }
         return false;
@@ -406,6 +406,14 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
         }
         Double gridOperationOperationalDouble = Double.parseDouble(gridOperationOperational);
         Double gridOperationWorkplanDouble = Double.parseDouble(gridOperationWorkplan);
+
+        // 奖励分值（2分）
+        String plusScore = kpiGridEntityExcel.getPlusScore();
+        if(ExcelUtils.checkNumber(plusScore)){
+            return true;
+        }
+        Double plusScorelDouble = Double.parseDouble(plusScore);
+
         if(stationEstablishmentBorderDouble < 0 || stationEstablishmentBorderDouble > 1
                 || stationEstablishmentLayoutDouble < 0 || stationEstablishmentLayoutDouble > 2
                 || stationEstablishmentStandardDouble < 0 || stationEstablishmentStandardDouble > 1
@@ -413,7 +421,8 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
                 || staffingPlacementOfficerDouble < 0 || staffingPlacementOfficerDouble > 1
                 || staffingPlacementPersonnelDouble < 0 || staffingPlacementPersonnelDouble > 1
                 || gridOperationOperationalDouble < 0 || gridOperationOperationalDouble > 2
-                || gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 1){
+                || gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 1
+                || plusScorelDouble < 0 || plusScorelDouble > 2){
             return true;
         }
         return false;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
index c21962c66..53619415a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml
@@ -36,6 +36,7 @@
         GRID_OPERATION,
         PARENT_DEPT_IDS,
         PARENT_DEPT_NAMES,
+        PLUS_SCORE,
         ALL_DEPT_IDS,
         ALL_DEPT_NAMES,
         REVISION,
@@ -98,4 +99,4 @@
     </update>
 
 
-</mapper>
\ No newline at end of file
+</mapper>