孔村采集api修改

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

@@ -38,15 +38,15 @@ public class KcProjectSatisanalysisFormDTO implements Serializable {
     /**
      * 非常满意项目总数
      */
-    private Integer greatSatis;
+    private Integer greatSatisfaction;
 
     /**
      * 满意项目总数
      */
-    private Integer goodSatis;
+    private Integer goodSatisfaction;
 
     /**
      * 不满意的项目总数
      */
-    private Integer disSatis;
+    private Integer disSatisfaction;
 }

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

@@ -48,7 +48,7 @@ public class KcUserSummaryFormDTO implements Serializable {
     /**
      * 党员用户
      */
-    private Integer partyUserCount;
+    private Integer partyCount;
 
     /**
      * 小于20岁的党员总人数

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

@@ -59,9 +59,9 @@
             #{item.gridName},
             #{item.parentAgencyId},
             #{item.allParentIds},
-            #{item.greatSatis},
+            #{item.greatSatisfaction},
-            #{item.goodSatis},
+            #{item.goodSatisfaction},
-            #{item.disSatis},
+            #{item.disSatisfaction},
             0,
             0,
             'APP_USER',

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

@@ -77,7 +77,7 @@
             #{item.allParentIds},
             #{item.visitorCount},
             #{item.regUserCount},
-            #{item.partyUserCount},
+            #{item.partyCount},
             #{item.ageLevel1},
             #{item.ageLevel2},
             #{item.ageLevel3},