Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupDetailFormDTO.java

@@ -63,5 +63,6 @@ public class KcGroupDetailFormDTO implements Serializable {
     /**
      * 转为议题的话题数
      */
-    private Integer shifitIssueCount;
+    private Integer shiftIssueCount;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActSummaryDailyDao.xml

@@ -22,7 +22,7 @@
 
     <delete id="deleteActSummary">
         delete from screen_kc_act_summary_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.xml

@@ -27,7 +27,7 @@
 
     <delete id="deleteGroupDetailGrid">
         delete from screen_kc_group_detail_grid_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 
@@ -70,7 +70,7 @@
             #{item.groupLeader},
             #{item.memberCount},
             #{item.topicCount},
-            #{item.shifitIssueCount},
+            #{item.shiftIssueCount},
             0,
             0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.xml

@@ -26,7 +26,7 @@
 
     <delete id="deleteGroupSummaryGrid">
         delete from screen_kc_group_summary_grid_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.xml

@@ -32,7 +32,7 @@
 
     <delete id="deleteIssueSummaryGrid">
         delete from screen_kc_issue_summary_grid_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.xml

@@ -23,7 +23,7 @@
 
     <delete id="deleteNewsCategoryAnalysis">
         delete from screen_kc_news_category_analysis
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.xml

@@ -21,7 +21,7 @@
 
     <delete id="deleteNewsSummary">
         delete from screen_kc_news_summary_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.xml

@@ -29,7 +29,7 @@
 
     <delete id="deletePlatFormSummary">
         delete from screen_kc_platform_summary_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.xml

@@ -24,7 +24,7 @@
 
     <delete id="deleteCategoryGrid">
         delete from screen_kc_project_category_grid_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.xml

@@ -29,7 +29,7 @@
 
     <delete id="deleteProjectSummary">
         delete from screen_kc_project_summary_grid_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml

@@ -32,7 +32,7 @@
 
     <delete id="deleteUserSummary">
         delete from screen_kc_user_summary_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.xml

@@ -29,7 +29,7 @@
 
     <delete id="deleteVolunteerSummary">
         delete from screen_kc_volunteer_summary_daily
-        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        where CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId}
         limit 1000;
     </delete>