Merge remote-tracking branch 'origin/dev_analysis' into dev_analysis

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

@@ -10,4 +10,6 @@ import lombok.Data;
  */
 @Data
 public class UserAnalysisDTO {
+
+
 }

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

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.user.result;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/2/11 13:09
+ *  @Description: 开通网格情况
+ */
+@Data
+public class GridOpeningResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -852226852590425991L;
+
+    /**
+     * 街道社区网格
+     */
+    private String allDeptName;
+    /**
+     * 用户注册数
+     */
+    private String registerCount;
+
+    /**
+     * 党员注册数
+     */
+    private String partyCount;
+
+}

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

@@ -2,8 +2,11 @@ package com.elink.esua.epdc.modules.user.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
+import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户数据分析相关
  *
@@ -12,4 +15,71 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
+    
+    /***
+     * 居民注册
+     * @param  
+     * @return java.util.List<com.elink.esua.epdc.dto.user.UserAnalysisDTO>
+     * @author qushutong
+     * @date 2020/2/11 12:32
+     */
+    List<GridOpeningResultDTO> selectListReigistCount();
+
+    /***
+     * 党员数
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:10
+     */
+    List<GridOpeningResultDTO> selectListPartyCount();
+
+    /***
+     * 居民扫码数
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:10
+     */
+    List<GridOpeningResultDTO> selectListEwmCount();
+
+
+    /***
+     * 新闻
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:10
+     */
+    List<GridOpeningResultDTO> selectListNewsCount();
+
+    /***
+     * 通知
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:10
+     */
+    List<GridOpeningResultDTO> selectListNoticeCount();
+
+
+    /***
+     * 议题数
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:10
+     */
+    List<GridOpeningResultDTO> selectListEventCount();
+
+
+    /***
+     * 项目数
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:10
+     */
+    List<GridOpeningResultDTO> selectListItemCount();
+
 }

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

@@ -1,5 +1,9 @@
 package com.elink.esua.epdc.modules.user.service;
 
+import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
+
+import java.util.List;
+
 /**
  * 用户数据分析相关业务
  *
@@ -7,4 +11,13 @@ package com.elink.esua.epdc.modules.user.service;
  * @date 2020/2/11 09:44
  */
 public interface UserAnalysisService {
+
+    /***
+     * 网格开通列表
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
+     * @author qushutong
+     * @date 2020/2/11 14:04
+     */
+    List<GridOpeningResultDTO> listPageGridOpening();
 }

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

@@ -2,12 +2,15 @@ package com.elink.esua.epdc.modules.user.service.impl;
 
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
+import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
 import com.elink.esua.epdc.dto.user.result.UserRegisterDataResultDTO;
 import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 用户数据分析业务实现
  *
@@ -18,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, UserAnalysisDTO> implements UserAnalysisService {
 
+    @Override
+    public List<GridOpeningResultDTO> listPageGridOpening() {
+        // 注册数
+        List<GridOpeningResultDTO> reigistCount = baseDao.selectListReigistCount();
+
+
+        return baseDao.selectListReigistCount();
+    }
 }

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

@@ -2,5 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.user.dao.UserAnalysisDao">
-
+    <select id="selectListReigistCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
+        SELECT
+	        CONCAT(ad2.`name`,ad1.`name`,t0.`name`) AS allDeptName,
+            count(uu.ID) AS registerCount
+        FROM
+            (
+                SELECT
+                    ad.id,
+                    ad.`name`,
+                    ad.pid
+                FROM
+                    esua_epdc_admin.sys_dept ad
+                WHERE
+                    ad.type_key = 'grid_party'
+                AND ad.del_flag = 0
+            ) t0
+        LEFT JOIN esua_epdc_user.epdc_user uu ON uu.DEPT_ID = t0.id
+        AND uu.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
+            t0.id
+        ORDER BY
+            t0.id ASC
+    </select>
 </mapper>