【网格实体化运作修改】-王公峰-2021-03-03

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;
 
-}
+	/**
+	 * 奖励分值
+	 */
+	private String plusScore;
+
+}

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

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/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>
+</mapper>