From 39b8ae99c32ec02e7ca381fb7b3377760a3b78ff Mon Sep 17 00:00:00 2001
From: Jackwang <373747285@qq.com>
Date: Wed, 12 Feb 2020 11:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E7=8A=B6?=
 =?UTF-8?q?=E5=86=B5=20=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/user/form/UserCountDTO.java   | 7 -------
 .../user/service/impl/UserAnalysisServiceImpl.java        | 2 --
 .../src/main/resources/mapper/user/UserAnalysisDao.xml    | 8 ++++----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
index dfbd436bf..ea322bef9 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
@@ -20,11 +20,4 @@ public class UserCountDTO{
     @NotNull(message = "部门id不能为空")
     private String deptId;
 
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
index df3301616..bed64539f 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
@@ -134,7 +134,6 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    @DataSource(name = DataSourceNames.FOURTH)
     @Override
     public Result getUserStatistics(UserCountDTO formDto) {
         UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto);
@@ -150,7 +149,6 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    @DataSource(name = DataSourceNames.FOURTH)
     @Override
     public Result getGridStatistics(UserCountDTO formDto) {
         GriddingCountDTO message = baseDao.getGridStatistics(formDto);
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 74136864b..6cb63d2a9 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
@@ -415,7 +415,7 @@
         ORDER BY
             t0.id ASC
     </select>
-    <select id="getUserStatistics" resultType="com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO">
+    <select id="getUserStatistics" resultType="com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO" parameterType="com.elink.esua.epdc.dto.user.form.UserCountDTO">
         SELECT
         t.userCount,
         t.partyMemberCount,
@@ -430,10 +430,10 @@
             esua_epdc_user.epdc_user u
         WHERE
         u.DEL_FLAG = '0'
-        AND u.DEPT_ID = #{formDto.deptId}
+        AND u.DEPT_ID = #{deptId}
         )t
     </select>
-    <select id="getGridStatistics" resultType="com.elink.esua.epdc.dto.user.result.GriddingCountDTO">
+    <select id="getGridStatistics" resultType="com.elink.esua.epdc.dto.user.result.GriddingCountDTO" parameterType="com.elink.esua.epdc.dto.user.form.UserCountDTO">
         SELECT
             COUNT( ad.id) gridTotle,
             COUNT( ac.ID) gridCount
@@ -447,7 +447,7 @@
             ad.type_key = 'grid_party'
             AND ad2.id != 1191534129122230274
             AND ad2.id != 1201319745506598913
-            AND ad2.id = #{formDto.deptId}
+            AND ad2.id = #{deptId}
         ORDER BY
             ad.create_date ASC
     </select>