From a3022879d3ec24373b405f46c061f769b457e2a8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 7 Sep 2020 14:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E7=9B=B4selectExtremeValue=20sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/evaluationindex/indexcal/DeptScoreDao.java     | 10 ++++++++++
 .../indexcal/impl/DeptScoreServiceImpl.java            |  3 ++-
 .../mapper/evaluationindex/indexcal/DeptScoreDao.xml   |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
index 8a13b7a0ff..4be461b59a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
@@ -77,4 +77,14 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
      */
     List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvg(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
 
+    /**
+     * @return int
+     * @param customerId
+     * @param monthId
+     * @param deptId
+     * @author yinzuomei
+     * @description
+     * @Date 2020/9/7 14:30
+     **/
+    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, @Param("monthId")String monthId,@Param("deptId") String deptId);
 }
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 52ea21e80a..959f3caa64 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
@@ -152,7 +152,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             indexMap.forEach((key, indexInputVO) -> {
                 if (StringUtils.isNotBlank(indexCodeFieldReService.getFieldNameByIndexCode(key))) {
                     //对应的数值
-                    String sampleValueStr = (String) recordMap.get(indexCodeFieldReService.getFieldNameByIndexCode(key));
+                    String sampleValueStr =String.valueOf(recordMap.get(indexCodeFieldReService.getFieldNameByIndexCode(key)));
                     //构造样本值对象
                     SampleValue<BigDecimal> currentGridIndexValue = new SampleValue((String) recordMap.get(IndexCalConstant.DEPT_ID), new BigDecimal(sampleValueStr));
                     indexInputVO.getIndexValueVOs().add(currentGridIndexValue);
@@ -194,6 +194,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             deptScoreEntity.setYearId(yearId);
             deptScoreEntity.setMonthId(formDTO.getMonthId());
             deptScoreEntity.setScore(governAblityScore);
+            deptScoreDao.deleteByDeptIdAndMonthId(formDTO.getCustomerId(),formDTO.getMonthId(),deptId);
             deptScoreDao.insert(deptScoreEntity);
         });
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
index 8ebc54bf91..077c6a7430 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
@@ -98,4 +98,10 @@
           AND MONTH_ID = #{monthId}
 		  ORDER BY DEPT_ID
     </select>
+
+    <delete id="deleteByDeptIdAndMonthId" parameterType="map">
+        delete from fact_index_dept_score where   CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+          and DEPT_ID=#{deptId}
+    </delete>
 </mapper>