From 1813d6afa44dfcd4a8e05ae1e5bcbba692276f9d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 15 Sep 2020 14:36:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=94=E6=9D=91=E9=87=87=E9=9B=86api?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/screencoll/form/KcProjectSatisanalysisFormDTO.java  | 6 +++---
 .../com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java | 2 +-
 .../screen/ScreenKcProjectSatisGridMonthlyDao.xml           | 6 +++---
 .../evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java
index 97843831e2..daccb603d2 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java
+++ b/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;
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java
index cd9b0db555..79e7c0a448 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java
+++ b/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岁的党员总人数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.xml
index 1147f687d5..740caa71e2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.xml
+++ b/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.goodSatis},
-            #{item.disSatis},
+            #{item.greatSatisfaction},
+            #{item.goodSatisfaction},
+            #{item.disSatisfaction},
             0,
             0,
             'APP_USER',
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml
index d1c0e9dea2..57bf0a99aa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml
+++ b/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},