孔村-数据采集 接口，测试完毕

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);
 
     /**
      * 批量插入

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

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);
 
     /**
      * 批量插入

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);
 }

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());
         }
     }
 

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>
 

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,