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

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java

@@ -414,14 +414,14 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
         }
         Double plusScorelDouble = Double.parseDouble(plusScore);
 
-        if(stationEstablishmentBorderDouble < 0 || stationEstablishmentBorderDouble > 1
-                || stationEstablishmentLayoutDouble < 0 || stationEstablishmentLayoutDouble > 2
-                || stationEstablishmentStandardDouble < 0 || stationEstablishmentStandardDouble > 1
-                || staffingPlacementInformationDouble < 0 || staffingPlacementInformationDouble > 1
-                || staffingPlacementOfficerDouble < 0 || staffingPlacementOfficerDouble > 1
-                || staffingPlacementPersonnelDouble < 0 || staffingPlacementPersonnelDouble > 1
-                || gridOperationOperationalDouble < 0 || gridOperationOperationalDouble > 2
-                || gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 1
+        if(stationEstablishmentBorderDouble < 0 || stationEstablishmentBorderDouble > 0.5
+                || stationEstablishmentLayoutDouble < 0 || stationEstablishmentLayoutDouble > 1
+                || stationEstablishmentStandardDouble < 0 || stationEstablishmentStandardDouble > 0.5
+                || staffingPlacementInformationDouble < 0 || staffingPlacementInformationDouble > 2
+                || staffingPlacementOfficerDouble < 0 || staffingPlacementOfficerDouble > 0.5
+                || staffingPlacementPersonnelDouble < 0 || staffingPlacementPersonnelDouble > 0.5
+                || gridOperationOperationalDouble < 0 || gridOperationOperationalDouble > 2.5
+                || gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 0.5
                 || plusScorelDouble < 0 || plusScorelDouble > 2){
             return true;
         }