From 2cf9bb2f016e5473d1ae58f0340b11e51fdaf86f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 May 2021 15:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=86=E6=95=B0=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=97=B6=20=E8=8E=B7=E5=8F=96=E5=85=9A=E5=91=98?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=8E=9F=E5=A7=8B=E5=80=BC=E6=97=B6=E4=BB=A5?= =?UTF-8?q?=E7=94=A8=E6=88=B7Id=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CpcIndexCalculateServiceImpl.java | 3 ++- .../FactIndexPartyAblityCpcMonthlyDao.xml | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java index d52c6891c5..2c7c1ac52d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java @@ -219,6 +219,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService { List> list = null; groupIndexDetailsMap.keySet().forEach(indexCode -> deleteOldData(formDTO, indexCode)); do { + //以党员userId为单位 获取数量 list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(),(pageNo - 1) * pageSize, pageSize, formDTO.getCustomerAreaCode(),formDTO.getSubCustomerIds()); if (!CollectionUtils.isEmpty(list)) { @@ -304,7 +305,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService { } log.info("计算的参数：{}", JSON.toJSONString(indexMap)); HashMap result = calculateScore(indexMap); - log.info("计算的结果：{}", result); + log.info("计算的结果：{}", JSON.toJSONString(result)); //处理结果 if (CollectionUtils.isEmpty(result)) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml index 9610514dcf..2f588f52ff 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml @@ -120,15 +120,15 @@ cpc.QUARTER_ID, cpc.YEAR_ID, cpc.USER_ID, - cpc.CREATE_TOPIC_COUNT, - cpc.JOIN_TOPIC_COUNT, - cpc.SHIFT_ISSUE_COUNT, - cpc.SHIFT_PROJECT_COUNT, - cpc.JOIN_THREE_MEETS_COUNT, - cpc.GROUP_USER_COUNT, - cpc.GROUP_TOPIC_COUNT, - cpc.TOPIC_TO_ISSUE_RATIO, - cpc.GROUP_ACTIVE_USER_COUNT + SUM(cpc.CREATE_TOPIC_COUNT) CREATE_TOPIC_COUNT, + SUM(cpc.JOIN_TOPIC_COUNT) JOIN_TOPIC_COUNT, + SUM(cpc.SHIFT_ISSUE_COUNT) SHIFT_ISSUE_COUNT, + SUM(cpc.SHIFT_PROJECT_COUNT) SHIFT_PROJECT_COUNT, + SUM(cpc.JOIN_THREE_MEETS_COUNT) JOIN_THREE_MEETS_COUNT, + SUM(cpc.GROUP_USER_COUNT) GROUP_USER_COUNT, + SUM(cpc.GROUP_TOPIC_COUNT) GROUP_TOPIC_COUNT, + SUM(cpc.TOPIC_TO_ISSUE_RATIO) TOPIC_TO_ISSUE_RATIO, + SUM(cpc.GROUP_ACTIVE_USER_COUNT) GROUP_ACTIVE_USER_COUNT FROM fact_index_party_ablity_cpc_monthly cpc inner join screen_customer_grid scg @@ -148,6 +148,7 @@ and scg.CUSTOMER_ID=#{customerId,jdbcType=VARCHAR} + GROUP BY cpc.USER_ID LIMIT #{offset},#{pageSize}