网格相关-党建能力网格群众用户数，网格党员用户数，从fact_reg_user_grid_daily中sum每天的增量。与运营端数据导出一致

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserGridMonthlyDao.java

@@ -48,6 +48,16 @@ public interface FactRegUserGridMonthlyDao extends BaseDao<FactRegUserGridMonthl
      */
     List<GridUserCountResultDTO> selectGridUserCount(String customerId, String monthId);
 
+    /**
+     * 网格相关-党建能力：网格群众用户数、网格党员用户数
+     * 从fact_reg_user_grid_daily这个表 sum增量，为了与运营端数据导出一致
+     *
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    List<GridUserCountResultDTO> selectGridUserCountFromDaily(@Param("customerId") String customerId, @Param("monthId")String monthId);
+
     /**
      * 查询网格下各用户数量
      * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -101,7 +101,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             return true;
         }
         // 网格群众用户数 , 网格党员用户数
-        List<GridUserCountResultDTO> gridUserCountList = userGridMonthlyService.selectGridUserCount(customerId, monthId);
+        List<GridUserCountResultDTO> gridUserCountList = userGridMonthlyService.selectGridUserCountFromDaily(customerId, monthId);
         // 网格党员人均提出话题数
         List<CreateTopicCountResultDTO> partyCreateTopicCountList = topicMainService.selectCreateTopicCount(customerId, monthId, NumConstant.ONE);
         // 网格群众人均提出话题数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java

@@ -104,6 +104,16 @@ public interface FactRegUserGridMonthlyService extends BaseService<FactRegUserGr
      */
     List<GridUserCountResultDTO> selectGridUserCount(String customerId,String monthId);
 
+    /**
+     * 网格相关-党建能力：网格群众用户数、网格党员用户数
+     * 从fact_reg_user_grid_daily这个表 sum增量，为了与运营端数据导出一致
+     *
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    List<GridUserCountResultDTO> selectGridUserCountFromDaily(String customerId,String monthId);
+
     /**
      * 查询网格下各用户数量
      *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridMonthlyServiceImpl.java

@@ -20,16 +20,15 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactRegUserGridMonthlyDao;
 import com.epmet.dto.extract.result.GridUserCountResultDTO;
 import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO;
 import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity;
 import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -112,6 +111,20 @@ public class FactRegUserGridMonthlyServiceImpl extends BaseServiceImpl<FactRegUs
         return baseDao.selectGridUserCount(customerId, monthId);
     }
 
+    /**
+     * 网格相关-党建能力：网格群众用户数、网格党员用户数
+     * 从fact_reg_user_grid_daily这个表 sum增量，为了与运营端数据导出一致
+     *
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    @Override
+    public List<GridUserCountResultDTO> selectGridUserCountFromDaily(String customerId, String monthId) {
+        return baseDao.selectGridUserCountFromDaily(customerId, monthId);
+    }
+
+
     @Override
     public List<FactRegUserGridMonthlyDTO> getGridUserCountByCustomer(String customerId, String monthId) {
         return baseDao.selectGridUserCountByCustomer(customerId, monthId);

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml

@@ -110,8 +110,8 @@
     <!-- 查询网格下的客户 -->
     <select id="selectGridUserCount" resultType="com.epmet.dto.extract.result.GridUserCountResultDTO">
         SELECT
-            REG_INCR,
-            PARTYMEMBER_INCR,
+            REG_INCR as userCount,
+            PARTYMEMBER_INCR as partyCount,
             GRID_ID as orgId,
             REG_TOTAL
         FROM
@@ -121,6 +121,21 @@
             AND CUSTOMER_ID = #{customerId}
             AND MONTH_ID = #{monthId}
     </select>
+
+    <!--   网格相关-党建能力：网格群众用户数、网格党员用户数 从fact_reg_user_grid_daily这个表 sum增量，为了与运营端数据导出一致 -->
+    <select id="selectGridUserCountFromDaily" parameterType="map" resultType="com.epmet.dto.extract.result.GridUserCountResultDTO">
+        SELECT
+            sum( m.REG_INCR ) AS userCount,
+            sum( m.PARTYMEMBER_INCR ) AS partyCount,
+            m.GRID_ID AS orgId
+        FROM
+            fact_reg_user_grid_daily m
+        WHERE
+            m.CUSTOMER_ID = #{customerId}
+            AND m.DATE_ID LIKE CONCAT(#{monthId},'%')
+            GROUP BY m.GRID_ID
+    </select>
+
     <select id="selectGridUserCountByCustomer" resultType="com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO">
         SELECT
             GRID_ID,