From 32bad925e2217ddc1989d3803f2f3f31eb5e4d85 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 10 Sep 2020 15:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=94=E6=9D=91-=E6=95=B0=E6=8D=AE=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=20=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenKcGroupSummaryGridDailyDao.java              | 2 +-
 .../epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java | 2 +-
 .../screen/ScreenKcProjectSummaryGridDailyDao.java            | 2 +-
 .../screen/ScreenKcUserTrendGridMonthlyDao.java               | 4 ++--
 .../evaluationindex/screen/impl/KcScreenCollServiceImpl.java  | 2 +-
 .../evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml    | 2 +-
 .../screen/ScreenKcUserTrendGridMonthlyDao.xml                | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java
index 6f457ec565..e942f1d7d7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java
@@ -44,7 +44,7 @@ public interface ScreenKcGroupSummaryGridDailyDao extends BaseDao<ScreenKcGroupS
      * @Date 16:14 2020-09-09
      **/
     Integer deleteGroupSummaryGrid(@Param("customerId") String customerId,
-                                  @Param("dateId") String dateId);
+                                   @Param("dateId") String dateId);
 
     /**
      * 批量插入
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java
index 842c6ea781..37d7e0e31e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java
@@ -35,7 +35,7 @@ import java.util.List;
 public interface ScreenKcNewsRankDao extends BaseDao<ScreenKcNewsRankEntity> {
 
     /**
-     * 按照customerId+dateId，清空数据
+     * 按照customerId，清空数据
      *
      * @param customerId
      * @return java.lang.Integer
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java
index aa89e45d2b..cac89d10c5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java
@@ -44,7 +44,7 @@ public interface ScreenKcProjectSummaryGridDailyDao extends BaseDao<ScreenKcProj
      * @Date 16:14 2020-09-09
      **/
     Integer deleteProjectSummary(@Param("customerId") String customerId,
-                                  @Param("dateId") String dateId);
+                                 @Param("dateId") String dateId);
 
     /**
      * 批量插入
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java
index 6c8e780788..a3bb44b7fa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java
@@ -44,7 +44,7 @@ public interface ScreenKcUserTrendGridMonthlyDao extends BaseDao<ScreenKcUserTre
      * @Date 16:14 2020-09-09
      **/
     Integer deleteUserTrendGrid(@Param("customerId") String customerId,
-                                  @Param("monthId") String monthId);
+                                @Param("monthId") String monthId);
 
     /**
      * 批量插入
@@ -57,5 +57,5 @@ public interface ScreenKcUserTrendGridMonthlyDao extends BaseDao<ScreenKcUserTre
      * @Date 16:17 2020-09-09
      **/
     void batchInsertUserTrendGrid(@Param("list") List<KcUserHeartRankFormDTO> list, @Param("customerId")String customerId,
-                                    @Param("monthId")String monthId);
+                                  @Param("monthId")String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java
index a7635d7aeb..a7f0684276 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java
@@ -300,7 +300,7 @@ public class KcScreenCollServiceImpl implements KcScreenCollService {
             } while (deleteNum != NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            screenKcNewsRankDao.batchInsertNewsRank(formDTO.getDataList(), customerId, formDTO.getMonthId());
+            screenKcNewsRankDao.batchInsertNewsRank(formDTO.getDataList(), customerId, formDTO.getDateId());
         }
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml
index 5ec689ebc0..4caffe8fba 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml
@@ -19,7 +19,7 @@
 
     <delete id="deleteNewsTrend">
         delete from screen_kc_news_trend_monthly
-        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{monthId}
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
         limit 1000;
     </delete>
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml
index fda42e28ae..4ba017252f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml
@@ -32,7 +32,7 @@
         (
         ID,
         CUSTOMER_ID,
-        MONTH_ID
+        MONTH_ID,
 
         GRID_ID,
         GRID_NAME,