From edf652f7f9d3dcef1b4da119b31e76a60286b849 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 3 Dec 2021 09:31:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3-=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E8=83=BD=E5=8A=9B=E7=BD=91=E6=A0=BC=E7=BE=A4=E4=BC=97?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=EF=BC=8C=E7=BD=91=E6=A0=BC=E5=85=9A?= =?UTF-8?q?=E5=91=98=E7=94=A8=E6=88=B7=E6=95=B0=EF=BC=8C=E4=BB=8Efact=5Fre?= =?UTF-8?q?g=5Fuser=5Fgrid=5Fdaily=E4=B8=ADsum=E6=AF=8F=E5=A4=A9=E7=9A=84?= =?UTF-8?q?=E5=A2=9E=E9=87=8F=E3=80=82=E4=B8=8E=E8=BF=90=E8=90=A5=E7=AB=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stats/user/FactRegUserGridMonthlyDao.java | 10 ++++++++++ .../impl/CalGridIndexServiceImpl.java | 2 +- .../user/FactRegUserGridMonthlyService.java | 10 ++++++++++ .../FactRegUserGridMonthlyServiceImpl.java | 17 +++++++++++++++-- .../stats/user/FactRegUserGridMonthlyDao.xml | 19 +++++++++++++++++-- 5 files changed, 53 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserGridMonthlyDao.java index 3eef3fda97..1361bdbf0a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserGridMonthlyDao.java +++ b/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 selectGridUserCount(String customerId, String monthId); + /** + * 网格相关-党建能力：网格群众用户数、网格党员用户数 + * 从fact_reg_user_grid_daily这个表 sum增量，为了与运营端数据导出一致 + * + * @param customerId + * @param monthId + * @return + */ + List selectGridUserCountFromDaily(@Param("customerId") String customerId, @Param("monthId")String monthId); + /** * 查询网格下各用户数量 * @author zhaoqifeng diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java index 76954c8212..e37586f930 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java +++ b/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 gridUserCountList = userGridMonthlyService.selectGridUserCount(customerId, monthId); + List gridUserCountList = userGridMonthlyService.selectGridUserCountFromDaily(customerId, monthId); // 网格党员人均提出话题数 List partyCreateTopicCountList = topicMainService.selectCreateTopicCount(customerId, monthId, NumConstant.ONE); // 网格群众人均提出话题数 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java index 7917a3c001..548c714629 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java +++ b/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 selectGridUserCount(String customerId,String monthId); + /** + * 网格相关-党建能力：网格群众用户数、网格党员用户数 + * 从fact_reg_user_grid_daily这个表 sum增量，为了与运营端数据导出一致 + * + * @param customerId + * @param monthId + * @return + */ + List selectGridUserCountFromDaily(String customerId,String monthId); + /** * 查询网格下各用户数量 * diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridMonthlyServiceImpl.java index b859133325..381258981d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridMonthlyServiceImpl.java +++ b/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 selectGridUserCountFromDaily(String customerId, String monthId) { + return baseDao.selectGridUserCountFromDaily(customerId, monthId); + } + + @Override public List getGridUserCountByCustomer(String customerId, String monthId) { return baseDao.selectGridUserCountByCustomer(customerId, monthId); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml index ae1950cdd4..1d04f913fb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml @@ -110,8 +110,8 @@ + + + +