From 17073bebad609ff515c054e126aa7b8fa2fdbbb5 Mon Sep 17 00:00:00 2001
From: Jackwang <373747285@qq.com>
Date: Wed, 12 Feb 2020 23:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=8F=8A?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=95=B0=E9=87=8F=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/user/result/GriddingCountDTO.java | 8 ++++++--
 .../src/main/resources/mapper/user/UserAnalysisDao.xml    | 2 +-
 .../esua/epdc/service/impl/AnalysisUserServiceImpl.java   | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
index b0e72f93a..6d3e67745 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.user.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @author: wangtong
  * @create: 2020-02-11 14:50
  **/
+@Data
 public class GriddingCountDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -15,10 +18,11 @@ public class GriddingCountDTO implements Serializable {
     /**
      *   网格总计
      **/
-    private String gridTotle;
+    private Integer gridTotle;
 
     /**
      *   开通网格数量
      **/
-    private String gridCount;
+    private Integer gridCount;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 3ea8a5773..e85e63b01 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -246,7 +246,7 @@
         SELECT
         t.userCount,
         t.partyMemberCount,
-        t.residentCount - t.partyMemberCount residentCount
+        t.residentCount - t.partyMemberCount allUserCount
         FROM
         (
         SELECT
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java
index 8973486d1..b49883c06 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java
@@ -100,12 +100,12 @@ public class AnalysisUserServiceImpl implements AnalysisUserService {
 
     @Override
     public Result getGridStatistics(UserCountDTO formDto) {
-        return analysisUserFeignClient.getUserStatistics(formDto);
+        return analysisUserFeignClient.getGridStatistics(formDto);
     }
 
     @Override
     public Result getUserStatistics(UserCountDTO formDto) {
-        return analysisUserFeignClient.getGridStatistics(formDto);
+        return analysisUserFeignClient.getUserStatistics(formDto);
     }