Merge branch 'master' of http://121.42.41.42:7070/r/esua-epdc-cloud

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiCaseHandlingDTO.java

@@ -118,4 +118,9 @@ public class KpiCaseHandlingDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 奖励分值
+     */
+    private String plusScore;
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java

@@ -164,4 +164,9 @@ public class KpiGridEntityDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 奖励分值
+     */
+    private String plusScore;
+
 }

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;
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java

@@ -130,4 +130,9 @@ public class KpiGridEntityEntity extends BaseEpdcEntity {
      */
 	private String allDeptNames;
 
+	/**
+	 * 奖励分值
+	 */
+	private String plusScore;
+
 }

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;
 

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;
 //

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;

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;

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,

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,