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 fc3c7532d1..474456ec41 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 @@ -130,6 +130,11 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { }); } + // 组织“三会一课”次数 前网格下 满足【未取消的活动 and 签到记录>1 and 活动开始时间在当前时间维度内】 +1 + // 党员参加“三会一课”人次 :本网格内注册的党员,在本月内活动签到次数 + Map createThreeMeetsCountMap=getCreateThreeMeetsCountMap(customerId,monthId); + Map joinThreeMeetsCountMap=getJoinThreeMeetsCountMap(customerId,monthId); + String quarterId = DateUtils.getQuarterId(monthId); String yearId = DateUtils.getYearId(monthId); result.forEach(r -> { @@ -217,6 +222,14 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { } }); } + // 组织“三会一课”次数 前网格下 满足【未取消的活动 and 签到记录>1 and 活动开始时间在当前时间维度内】 +1 + if (createThreeMeetsCountMap.containsKey(r.getGridId())) { + r.setCreateThreeMeetsCount(createThreeMeetsCountMap.get(r.getGridId())); + } + // 党员参加“三会一课”人次 :本网格内注册的党员,在本月内活动签到次数 + if (joinThreeMeetsCountMap.containsKey(r.getGridId())) { + r.setJoinThreeMeetsCount(joinThreeMeetsCountMap.get(r.getGridId())); + } }); delPartyAbility(customerId, monthId); List> partition = ListUtils.partition(result, NumConstant.ONE_HUNDRED); @@ -226,6 +239,19 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { return true; } + + private Map getJoinThreeMeetsCountMap(String customerId, String monthId) { + // 组织“三会一课”次数 前网格下 满足【未取消的活动 and 签到记录>1 and 活动开始时间在当前时间维度内】 +1 + // todo + return null; + } + + private Map getCreateThreeMeetsCountMap(String customerId, String monthId) { + // 党员参加“三会一课”人次 :本网格内注册的党员,在本月内活动签到次数 + // todo + return null; + } + /** * @Description 计算网格指标治理能力 * @param customerId