From 4a92ac9f986d02e815e77a071d2d5d5c26ace0ac Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 3 Mar 2021 11:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A1=88=E4=BB=B6=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=E6=89=93=E5=88=86=E4=BF=AE=E6=94=B9=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2021-03-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/entity/KpiCaseHandlingEntity.java    |  5 +++++
 .../esua/epdc/excel/KpiCaseHandlingExcel.java      |  3 +++
 .../service/impl/KpiCaseHandlingServiceImpl.java   | 14 ++++++++++++--
 .../main/resources/mapper/KpiCaseHandlingDao.xml   |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java
index 0c888fd95..023f61b9f 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java
@@ -88,4 +88,9 @@ public class KpiCaseHandlingEntity extends BaseEpdcEntity {
      */
 	private String allDeptNames;
 
+	/**
+	 * 奖励分值
+	 */
+	private String plusScore;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java
index b593a6c30..7b8ffe678 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java
@@ -49,6 +49,9 @@ public class KpiCaseHandlingExcel {
     @Excel(name = "案件处置情况打分")
     private String caseHandling;
 
+    @Excel(name = "奖励分值")
+    private String plusScore;
+
 //    @Excel(name = "案件处置情况打分最终分数")
 //    private String caseHandlingScore;
 
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java
index 70391ff3f..7827cef2e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java
@@ -314,7 +314,16 @@ public class KpiCaseHandlingServiceImpl extends BaseServiceImpl<KpiCaseHandlingD
             return true;
         }
         Double caseHandlingDouble = Double.parseDouble(caseHandling);
-        if(caseHandlingDouble < 0 || caseHandlingDouble > 100){
+
+        // 奖励分值（2分）
+        String plusScore = kpiCaseHandlingExcel.getPlusScore();
+        if(ExcelUtils.checkNumber(plusScore)){
+            return true;
+        }
+        Double plusScorelDouble = Double.parseDouble(plusScore);
+
+        if(caseHandlingDouble < 0 || caseHandlingDouble > 100
+                || plusScorelDouble < 0 || plusScorelDouble > 2){
             return true;
         }
         return false;
@@ -327,7 +336,8 @@ public class KpiCaseHandlingServiceImpl extends BaseServiceImpl<KpiCaseHandlingD
      */
     private Boolean checkNullCell(KpiCaseHandlingExcel kpiCaseHandlingExcel){
         if(StringUtils.isBlank(kpiCaseHandlingExcel.getDeptId()) || StringUtils.isBlank(kpiCaseHandlingExcel.getDeptName()) || StringUtils.isBlank(kpiCaseHandlingExcel.getMonthYear())
-                || StringUtils.isBlank(kpiCaseHandlingExcel.getCaseHandling())){
+                || StringUtils.isBlank(kpiCaseHandlingExcel.getCaseHandling())
+                || StringUtils.isBlank(kpiCaseHandlingExcel.getPlusScore())){
             return true;
         }
         return false;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml
index 12c5fb69e..d09f9af24 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml
@@ -31,6 +31,7 @@
         sd.MONTH_YEAR,
         sd.CASE_HANDLING,
         sd.CASE_HANDLING_SCORE,
+        sd.PLUS_SCORE,,
         sd.PARENT_DEPT_IDS,
         sd.PARENT_DEPT_NAMES,
         sd.ALL_DEPT_IDS,