网格开通情况数据总计；其他

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+/**
+ * 已开通网格 用户数据总计
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/13 13:46
+ */
+@Data
+public class GridDataTotalResultDTO extends GridOpeningResultDTO {
+
+    /**
+     * 已开通网格数
+     */
+    private Integer workGridCount;
+    /**
+     * 未开通网格数
+     */
+    private Integer unWorkGridCount;
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java

@@ -19,14 +19,15 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.excel.PartyAnalysExcel;
 import com.elink.esua.epdc.excel.RegisterExcel;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
+
 import java.util.List;
 import java.util.Map;
+
 import org.springframework.web.bind.annotation.RequestParam;
+
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -62,10 +63,25 @@ public class UserAnalysisController {
         PageData<UserDataRankResultDTO> pageData = userAnalysisService.pageUserDataRank(params);
         return new Result().ok(pageData);
     }
+
+    /**
+     * 网格开通数据总计（pc端网格开通情况，数据总计）
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/2/13 14:22
+     */
+    @GetMapping("pageGridDataToal")
+    public Result<GridDataTotalResultDTO> selectGridDataTotal(@RequestParam Map<String, Object> params) {
+        GridDataTotalResultDTO result = userAnalysisService.selectGridDataTotal(params);
+        return new Result().ok(result);
+    }
+
     /***
      * 开通网格分页
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>>
      * @author qushutong
      * @date 2020/2/11 16:01
      */
@@ -74,36 +90,39 @@ public class UserAnalysisController {
         PageData<GridOpeningResultDTO> page = userAnalysisService.listPageGridOpening(params);
         return new Result<PageData<GridOpeningResultDTO>>().ok(page);
     }
+
     /**
-     * @Description  党员老龄化列表
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>>
+     * @Description 党员老龄化列表
      * @Author songyunpeng
-     * @Date  2020/2/11
+     * @Date 2020/2/11
      * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>>
      **/
     @GetMapping("partyMemberOldSort")
     public Result<List<OldMemberRankResultDTO>> listOldMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return this.oldMemberRankService.listOldMemberRankByDeptId(formDto);
     }
+
     /**
-     * @Description  党员年轻化列表
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO>>
+     * @Description 党员年轻化列表
      * @Author songyunpeng
-     * @Date  2020/2/11
+     * @Date 2020/2/11
      * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO>>
      **/
     @GetMapping("partyMemberYoungSort")
     public Result<List<YoungMemberRankResultDTO>> listYoungMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return this.youngMemberRankService.listYoungMemberRankByDeptId(formDto);
     }
+
     /**
-     * @Description  注册用户数排名
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
+     * @Description 注册用户数排名
      * @Author lpf
-     * @Date  2020/2/11
+     * @Date 2020/2/11
      * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
      **/
     @GetMapping("userRegisterSort")
     public Result<List<UserSortRankResultDTO>> userRegisterSort(@RequestBody UserSortRankFormDTO formDto) {
@@ -112,12 +131,12 @@ public class UserAnalysisController {
     }
 
     /**
-     *用户数据统计
+     * 用户数据统计
      *
-     * @author wangtong
-     * @date 2020/2/11 11:57
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author wangtong
+     * @date 2020/2/11 11:57
      */
     @GetMapping("getUserStatistics")
     public Result getUserStatistics(@RequestBody UserCountDTO formDto) {
@@ -126,18 +145,19 @@ public class UserAnalysisController {
     }
 
     /**
-     *网格开通状况
+     * 网格开通状况
      *
-     * @author wangtong
-     * @date 2020/2/11 14:26
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author wangtong
+     * @date 2020/2/11 14:26
      */
     @GetMapping("getGridStatistics")
-    public Result getGridStatistics(@RequestBody UserCountDTO  formDto) {
+    public Result getGridStatistics(@RequestBody UserCountDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return userAnalysisService.getGridStatistics(formDto);
     }
+
     /***
      * 注册用户总数排名分析导出
      * @param params

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java

@@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
 import com.elink.esua.epdc.dto.user.form.UserCountDTO;
 import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
-import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
-import com.elink.esua.epdc.dto.user.result.GriddingCountDTO;
-import com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO;
-import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
-import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO;
+import com.elink.esua.epdc.dto.user.result.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -131,4 +127,22 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      * @date 2020/2/13 11:18
      */
     List<GridOpeningResultDTO> selectListNewsNoticeEventCount(Map<String, Object> params);
+
+    /**
+     * 查询已开通网格数和未开通网格数
+     * @param  params
+     * @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO
+     * @author work@yujt.net.cn
+     * @date 2020/2/13 13:50
+     */
+    GridDataTotalResultDTO selectCountGridWorkOrNot(Map<String, Object> params);
+
+    /**
+     * 查询用户注册数，党员注册，居民注册数
+     * @param params
+     * @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO
+     * @author work@yujt.net.cn
+     * @date 2020/2/13 14:11
+     */
+    GridDataTotalResultDTO selectUserRegisterDataCount(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java

@@ -3,8 +3,8 @@ package com.elink.esua.epdc.modules.user.service;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.user.form.UserCountDTO;
+import com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO;
 import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
 import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO;
@@ -40,33 +40,42 @@ public interface UserAnalysisService {
     PageData<UserDataRankResultDTO> pageUserDataRank(Map<String, Object> params);
 
     /**
-     * @Description  注册用户数排名
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
+     * @Description 注册用户数排名
      * @Author lpf
-     * @Date  2020/2/11
+     * @Date 2020/2/11
      * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
      **/
     Result<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto);
 
 
     /**
-     *用户数据统计
+     * 用户数据统计
      *
-     * @author wangtong
-     * @date 2020/2/11 17:14
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author wangtong
+     * @date 2020/2/11 17:14
      */
     Result getUserStatistics(UserCountDTO formDto);
 
     /**
-     *网格开通状况
+     * 网格开通状况
      *
-     * @author wangtong
-     * @date 2020/2/11 17:15
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author wangtong
+     * @date 2020/2/11 17:15
      */
     Result getGridStatistics(UserCountDTO formDto);
 
+    /**
+     * 网格开通数据总计
+     *
+     * @param params
+     * @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO
+     * @author work@yujt.net.cn
+     * @date 2020/2/13 14:22
+     */
+    GridDataTotalResultDTO selectGridDataTotal(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -15,11 +15,7 @@ import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
 import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
 import com.elink.esua.epdc.dto.user.form.UserCountDTO;
-import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
-import com.elink.esua.epdc.dto.user.result.GriddingCountDTO;
-import com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO;
-import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
-import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO;
+import com.elink.esua.epdc.dto.user.result.*;
 import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import com.google.common.collect.Lists;
@@ -75,6 +71,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                         resultDto.setRegisterCount(registerData.getRegisterCount());
                         resultDto.setPartyCount(registerData.getPartyCount());
                         resultDto.setResidentCount(registerData.getResidentCount());
+                        break;
                     }
                 }
                 for (GridOpeningResultDTO nneCountData : nneCountList) {
@@ -82,12 +79,14 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                         resultDto.setNewsCount(nneCountData.getNewsCount());
                         resultDto.setNoticeCount(nneCountData.getNoticeCount());
                         resultDto.setEventCount(nneCountData.getEventCount());
+                        break;
                     }
                 }
                 for (GridOpeningResultDTO itemCountData : itemCountList) {
                     if (resultDto.getGridId().equals(itemCountData.getGridId())) {
                         resultDto.setItemCount(itemCountData.getItemCount());
                         resultDto.setItemCloseCount(itemCountData.getItemCloseCount());
+                        break;
                     }
                 }
                 for (GridOpeningResultDTO communityCountData : communityCountList) {
@@ -95,6 +94,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                         resultDto.setCommunityCount(communityCountData.getCommunityCount());
                         resultDto.setCommunityTopicCount(communityCountData.getCommunityTopicCount());
                         resultDto.setCommunityMemberCount(communityCountData.getCommunityMemberCount());
+                        break;
                     }
                 }
             }
@@ -183,4 +183,23 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         List<UserSortRankResultDTO> data = baseDao.userRegisterSort(formDto, SecurityUser.getUser().getDeptIdList());
         return new Result<List<UserSortRankResultDTO>>().ok(data);
     }
+
+    @Override
+    public GridDataTotalResultDTO selectGridDataTotal(Map<String, Object> params) {
+
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
+
+        // 网格开通数，网格未开通数
+        GridDataTotalResultDTO gridWorkOrNot = baseDao.selectCountGridWorkOrNot(params);
+        // 用户注册数，党员注册，居民注册数
+        GridDataTotalResultDTO registerDataCount = baseDao.selectUserRegisterDataCount(params);
+
+        GridDataTotalResultDTO result = new GridDataTotalResultDTO();
+        result.setWorkGridCount(gridWorkOrNot.getWorkGridCount());
+        result.setUnWorkGridCount(gridWorkOrNot.getUnWorkGridCount());
+        result.setResidentCount(registerDataCount.getResidentCount());
+        result.setRegisterCount(registerDataCount.getRegisterCount());
+        result.setPartyCount(registerDataCount.getPartyCount());
+        return null;
+    }
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -29,8 +29,7 @@
                 FROM
                     esua_epdc_user.epdc_user uu
                     LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
-                    LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-                    LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+                    <include refid="joinCommunityStreet"></include>
                 WHERE uu.DEL_FLAG = '0'
                     <if test='partyFlag != null and partyFlag = "1"'>AND uu.PARTY_FLAG = '1'</if>
                     <choose>
@@ -49,21 +48,11 @@
                 ) t
             ) t1
         <choose>
-            <when test='category != null and category == "0"'>
-                order by t1.oldCount desc
-            </when>
-            <when test='category != null and category == "1"'>
-                order by t1.youngCount desc
-            </when>
-            <when test='category != null and category == "2"'>
-                order by t1.oldCount asc
-            </when>
-            <when test='category != null and category == "3"'>
-                order by t1.youngCount asc
-            </when>
-            <otherwise>
-                GROUP BY t1.streetId
-            </otherwise>
+            <when test='category != null and category == "0"'> order by t1.oldCount desc </when>
+            <when test='category != null and category == "1"'> order by t1.youngCount desc </when>
+            <when test='category != null and category == "2"'> order by t1.oldCount asc </when>
+            <when test='category != null and category == "3"'> order by t1.youngCount asc </when>
+            <otherwise> GROUP BY t1.streetId </otherwise>
         </choose>
     </select>
 
@@ -75,10 +64,8 @@
         FROM
         esua_epdc_user.epdc_user uu
         LEFT JOIN esua_epdc_user.epdc_party_authentication_failed uf ON uu.id = uf.user_id
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
-        AND ad.type_key = 'grid_party'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+        <include refid="joinCommunityStreet"></include>
         WHERE
         uu.DEL_FLAG = '0'
         AND uu.PARTY_FLAG = '0'
@@ -109,8 +96,7 @@
                     ad.type_key = 'grid_party'
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id
-        AND ug.DEL_FLAG = '0'
+        LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id AND ug.DEL_FLAG = '0'
         LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
         LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
         GROUP BY
@@ -261,8 +247,7 @@
         COUNT( uu.PARTY_FLAG = '1' OR NULL ) partyMemberCount
         FROM
         esua_epdc_user.epdc_user uu
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
-        AND ad.type_key = 'grid_party'
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
         LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
         LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
@@ -318,10 +303,8 @@
             CONCAT( ad2.`name`, '-', ad1.`name`, '-', ad.`name` ) AS allDeptName,
             GROUP_CONCAT( DISTINCT u.real_name ) gridLeader
         FROM
-            esua_epdc_admin.sys_dept ad
+            <include refid="fromGridCommunityStreet"></include>
             LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
-            LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
-            LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
             LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
             LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
             LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
@@ -359,4 +342,51 @@
             ) t
         GROUP BY t.DEPT_ID
     </select>
+
+    <select id="selectCountGridWorkOrNot"
+            resultType="com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO">
+        SELECT
+            COUNT(t.ID = 'unwork' OR NULL) unWorkGridCount, COUNT(t.ID != 'unwork' OR NULL) workGridCount
+        FROM (
+            SELECT
+                IFNULL( ama.id, 'unwork' ) id
+            FROM
+                <include refid="fromGridCommunityStreet"></include>
+                LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
+            WHERE
+                ad.type_key = 'grid_party'
+                AND ad.del_flag = 0
+            GROUP BY
+            ad.id
+            )t
+    </select>
+    <select id="selectUserRegisterDataCount"
+            resultType="com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO">
+        SELECT
+            COUNT( t.ID ) registerCount,
+            COUNT(t.PARTY_FLAG = '0' OR NULL) residentCount,
+            COUNT(t.PARTY_FLAG = '1' OR NULL) partyCount
+        FROM (
+            SELECT uu.ID, uu.DEPT_ID, uu.STATE, uu.PARTY_FLAG
+            FROM esua_epdc_user.epdc_user uu
+            WHERE uu.DEL_FLAG = '0'
+                <if test="deptIdList != null and deptIdList.size() > 0">
+                    AND uu.DEPT_ID in <include refid="foreachDeptIdList"></include>
+                </if>
+                <if test="startTime != null and endTime != null and endTime != ''">
+                    AND uu.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
+                </if>
+                AND uu.DEPT_ID IS NOT NULL
+            ) t
+    </select>
+
+    <sql id="fromGridCommunityStreet">
+        esua_epdc_admin.sys_dept ad
+        <include refid="joinCommunityStreet"></include>
+    </sql>
+
+    <sql id="joinCommunityStreet">
+        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
+        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+    </sql>
 </mapper>