From 3640f3740b5306c652d0000dbd49a9c47103f28d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 May 2021 14:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3=EF=BC=9A?= =?UTF-8?q?=E5=8F=82=E5=8A=A0=E4=B8=89=E4=B8=80=E4=BC=9A=E4=B8=80=E8=AF=BE?= =?UTF-8?q?=E6=AC=A1=E6=95=B0joinThreeMeetsCount=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=20sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/group/GroupDataDao.java | 2 +- .../dataToIndex/impl/CalCpcIndexServiceImpl.java | 6 +++--- .../epmet/service/group/impl/GroupDataServiceImpl.java | 2 +- .../src/main/resources/mapper/group/GroupDataDao.xml | 10 ++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java index 8d4fb6f16a..fae2cfd223 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java @@ -93,7 +93,7 @@ public interface GroupDataDao { List groupExtracting(@Param("customerId")String customerId,@Param("dateId") String dateId); /** - * 查询小组活动签到表，计算用户在本月内签到的活动次数 + * 查询小组活动签到表，计算用户在本月内签到的活动次数 限制活动分类编码100001 三会一课 * * @param customerId * @param monthId diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java index 5a30c84911..353c3ad882 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java @@ -74,7 +74,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService { Map shiftIssueCountMap = calShiftIssueCount(customerId, monthId); //4、党员提出的议题转项目数 Map shiftProjectCountMap = calShiftProjectCount(customerId, monthId); - //5、参加“三会一课”次数 默认0 ：当前用户在本月内活动签到次数 + //5、参加“三会一课”次数 默认0 ：当前用户在本月内活动签到次数 限制活动分类编码100001 三会一课 Map joinThreeMeetsCountMap=calJoinThreeMeetsCount(customerId,monthId); //可以先查询出每个党员的 自建群 @@ -109,7 +109,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService { if (shiftProjectCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())) { indexPartyAblityCpcEntity.setShiftProjectCount(shiftProjectCountMap.get(indexPartyAblityCpcEntity.getUserId())); } - //5、参加“三会一课”次数 目前没有此业务，默认0 : 当前用户在本月内活动签到次数 + //5、参加“三会一课”次数 目前没有此业务，默认0 : 当前用户在本月内活动签到次数 限制活动分类编码100001 三会一课 if(joinThreeMeetsCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){ indexPartyAblityCpcEntity.setJoinThreeMeetsCount(joinThreeMeetsCountMap.get(indexPartyAblityCpcEntity.getUserId())); } @@ -232,7 +232,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService { * @param customerId * @param monthId * @author yinzuomei - * @description 5:参加“三会一课”次数 : 当前用户在本月内活动签到次数 + * @description 5:参加“三会一课”次数 : 当前用户在本月内活动签到次数 限制活动分类编码100001 三会一课 * @Date 2021/5/12 13:38 **/ private Map calJoinThreeMeetsCount(String customerId, String monthId) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java index 20927df80a..550c0d73e8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java @@ -211,7 +211,7 @@ public class GroupDataServiceImpl implements GroupDataService { } /** - * 查询小组活动签到表，计算用户在本月内签到的活动次数 + * 查询小组活动签到表，计算用户在本月内签到的活动次数 限制活动分类编码100001 三会一课 * * @param customerId * @param monthId diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml index 08b32f97fe..a5de0e01ab 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml @@ -214,17 +214,23 @@ - +