From 85fbcbd8d4f675cd13c22d67e240da535f9c70f1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 10 Sep 2020 09:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=9A=84=E4=BA=8B=E5=AE=9E=E8=AE=B0=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E8=B5=8B=E5=80=BC50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcal/impl/DeptScoreServiceImpl.java          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
index dba7178f96..6dc176a887 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
@@ -106,12 +106,14 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
         if (NumConstant.ZERO == total) {
             log.warn(String.format("customerId=%s,monthId=%s,fact_index_govrn_ablity_dept_monthly have not any fact record", formDTO.getCustomerId(), formDTO.getMonthId()));
             return Boolean.FALSE;
-        } else if (NumConstant.ONE == total) {
+        }
+        //只有一个部门的事实记录时无需处理以下代码注释
+       /* else if (NumConstant.ONE == total) {
             //只有一个网格时
             log.warn(String.format("customerId:%s,monthId:%s,only one fact_index_govrn_ablity_dept_monthly record", formDTO.getCustomerId(), formDTO.getMonthId()));
             this.handleOneGridScene(formDTO);
             return Boolean.TRUE;
-        }
+        }*/
 
         //2、计算最大最小值
         Map<String, Object> minAndMaxMap = factIndexGovrnAblityDeptMonthlyDao.selectExtremeValue(formDTO);
@@ -203,15 +205,15 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
      * @param formDTO
      * @return void
      * @author yinzuomei
-     * @description
+     * @description 只有一个部门的事实记录时无需处理以下代码注释
      * @Date 2020/9/3 9:35
      **/
-    private void handleOneGridScene(CalculateCommonFormDTO formDTO) {
+    /*private void handleOneGridScene(CalculateCommonFormDTO formDTO) {
         FactIndexGovrnAblityDeptMonthlyEntity entity = factIndexGovrnAblityDeptMonthlyDao.selectOneRecord(formDTO.getCustomerId(), formDTO.getMonthId());
         HashMap<String, BigDecimal> resultMap = new HashMap<>();
         resultMap.put(entity.getDeptId(), new BigDecimal(NumConstant.FIFTY_STR));
         this.saveDeptScoreEntity(formDTO, resultMap);
-    }
+    }*/
 
     /**
      * @param indexList