用户数据统计,网格开通状况 参数格式修改

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;
-    }
 }

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);

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>