有阈值，且最大值>阈值，则最大值赋值为阈值；allRegion=》district

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityFormDTO.java

@@ -40,11 +40,6 @@ public class DeptGovrnAbilityFormDTO implements Serializable {
      */
     private String yearId;
 
-    /**
-     * allRegion：全区；community：社区；street：街道
-     */
-    private String dataType;
-
     /**
      * 区直部门被吹哨次数
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java

@@ -41,7 +41,7 @@ public class OrgGovrnAbilityFormDTO implements Serializable {
     private String yearId;
 
     /**
-     * allRegion：全区；community：社区；street：街道
+     * district：全区；community：社区；street：街道
      */
     private String dataType;
 

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgPartyAbilityFormDTO.java

@@ -41,7 +41,7 @@ public class OrgPartyAbilityFormDTO implements Serializable {
     private String yearId;
 
     /**
-     * allRegion：全区；community：社区；street：街道
+     * district：全区；community：社区；street：街道
      */
     private String dataType;
 

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java

@@ -41,7 +41,7 @@ public class OrgServiceAbilityFormDTO implements Serializable {
     private String yearId;
 
     /**
-     * allRegion：全区；community：社区；street：街道
+     * district：全区；community：社区；street：街道
      */
     private String dataType;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java

@@ -70,7 +70,7 @@ public class FactIndexGovrnAblityOrgMonthlyEntity extends BaseEpmetEntity {
 	private String yearId;
 
     /**
-     * 数据类型 allRegion：全区；street：街道；community：社区；grid：网格
+     * 数据类型 district：全区；street：街道；community：社区；grid：网格
      */
 	private String dataType;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexPartyAblityOrgMonthlyEntity.java

@@ -74,7 +74,7 @@ public class FactIndexPartyAblityOrgMonthlyEntity extends BaseEpmetEntity {
 	private Integer publishArticleCount;
 
     /**
-     * 数据类型 allRegion：全区；community：社区；street：街道
+     * 数据类型 district：全区；community：社区；street：街道
      */
 	private String dataType;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexServiceAblityOrgMonthlyEntity.java

@@ -74,7 +74,7 @@ public class FactIndexServiceAblityOrgMonthlyEntity extends BaseEpmetEntity {
 	private Integer activityCount;
 
     /**
-     * 数据类型 allRegion：全区；street：街道；community：社区；grid：网格
+     * 数据类型 district：全区；street：街道；community：社区；grid：网格
      */
 	private String dataType;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptCorreLationService.java

@@ -0,0 +1,20 @@
+package com.epmet.service.indexcal;
+
+import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+
+/**
+ * 区直部门指标计算
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/2 14:57
+ */
+public interface DeptCorreLationService {
+    /**
+     * @return java.lang.Boolean
+     * @param formDTO
+     * @author yinzuomei
+     * @description 区直部门，分值计算
+     * @Date 2020/8/26 10:51
+     **/
+    Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptCorreLationServiceImpl.java

@@ -0,0 +1,33 @@
+package com.epmet.service.indexcal.impl;
+
+import com.epmet.dao.indexcoll.FactIndexGovrnAblityDeptMonthlyDao;
+import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+import com.epmet.service.indexcal.DeptCorreLationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 区直部门指标计算
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/2 14:58
+ */
+@Slf4j
+@Service
+public class DeptCorreLationServiceImpl implements DeptCorreLationService {
+    @Autowired
+    private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao;
+
+    /**
+     * @param formDTO
+     * @return java.lang.Boolean
+     * @author yinzuomei
+     * @description 区直部门，分值计算
+     * @Date 2020/8/26 10:51
+     **/
+    @Override
+    public Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO) {
+        return null;
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java

@@ -433,6 +433,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                 minValue = new BigDecimal(String.valueOf(minAndMaxMap.get(minValueKey)));
                 maxValue = new BigDecimal(String.valueOf(minAndMaxMap.get(maxValueKey)));
             }
+            //有阈值，且最大值>阈值，则最大值赋值为阈值
+            if (new BigDecimal(NumConstant.ONE_NEG_STR).compareTo(index.getThreshold()) != NumConstant.ZERO
+                    && maxValue.compareTo(index.getThreshold()) == NumConstant.ONE) {
+                maxValue = index.getThreshold();
+            }
             //分值计算器
             ScoreCalculator scoreCalculator = new BigDecimalScoreCalculator(minValue,
                     maxValue,