| | |
| | | } |
| | | |
| | | @Override |
| | | public R institutionalUnitServiceAnalysis(Integer year, Integer type, Integer range, Long communityId,Integer page,Integer size,String belongTo,Long unitId) { |
| | | public R institutionalUnitServiceAnalysis(Integer year, Integer type, Integer range, Long communityId, |
| | | Integer page,Integer size,String belongTo,Long unitId,String searchContent) { |
| | | ActivityAnalysisVO activityVO=new ActivityAnalysisVO(); |
| | | String beginTime=null; |
| | | String endTime=null; |
| | |
| | | } |
| | | } |
| | | //获取党员活动统计数据 |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId); |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId); |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId,searchContent); |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId,searchContent); |
| | | if (partyMemberAnalysisVOS1.size()>0){ |
| | | for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS1) { |
| | | if (ObjectUtils.isNotEmpty(vo)){ |
| | |
| | | List<NewFightNeedProblemClaim> inventories = newFightNeedProblemClaimMapper.selectList(wrapper); |
| | | Map<String, Long> collectMap = inventories.stream() |
| | | .collect(Collectors.groupingBy(NewFightNeedProblemClaim::getTaskId, Collectors.counting())); |
| | | long sum = unitVO.getAwardSum(); |
| | | long sum = 0l; |
| | | if(unitVO.getAwardSum()!=null || unitVO.getAwardSum()!=0l ) |
| | | { |
| | | sum=unitVO.getAwardSum(); |
| | | } |
| | | //任务id集合 |
| | | // List<String> taskIds = inventories.stream().map(NewFightNeedProblemClaim::getTaskId).distinct().collect(Collectors.toList()); |
| | | // for (String taskId : taskIds) { |
| | | //// NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId); |
| | | //// String award = newFightNeedProblemInventory.getAward(); |
| | | // String award = awardMap.get(Long.parseLong(taskId)); |
| | | // Long count = collectMap.get(taskId); |
| | | // long i = Long.parseLong(award) * count; |
| | | // sum = sum + i; |
| | | // } |
| | | // unitVO.setAwardSum(sum); |
| | | List<String> taskIds = inventories.stream().map(NewFightNeedProblemClaim::getTaskId).distinct().collect(Collectors.toList()); |
| | | for (String taskId : taskIds) { |
| | | // NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId); |
| | | // String award = newFightNeedProblemInventory.getAward(); |
| | | String award = awardMap.get(Long.parseLong(taskId)); |
| | | Long count = collectMap.get(taskId); |
| | | long i = Long.parseLong(award) * count; |
| | | sum = sum + i; |
| | | } |
| | | unitVO.setAwardSum(sum); |
| | | } |
| | | |
| | | //报道党员统计积分 |
| | |
| | | LambdaQueryWrapper<NewFightNeedProblemClaim> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(NewFightNeedProblemClaim::getUserId,userId); |
| | | List<NewFightNeedProblemClaim> newFightNeedProblemInventories = newFightNeedProblemClaimMapper.selectList(wrapper); |
| | | long sumAward = memberAnalysisVO.getPartyCount(); |
| | | // for (NewFightNeedProblemClaim inventory : newFightNeedProblemInventories) { |
| | | // String taskId = inventory.getTaskId(); |
| | | // NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId); |
| | | // String award = newFightNeedProblemInventory.getAward(); |
| | | // sumAward = Long.parseLong(award) + sumAward; |
| | | // } |
| | | long sumAward = 0l; |
| | | |
| | | if(memberAnalysisVO.getPartyCount()!=null || memberAnalysisVO.getPartyCount()!=0l ) |
| | | { |
| | | sumAward=memberAnalysisVO.getPartyCount(); |
| | | } |
| | | |
| | | for (NewFightNeedProblemClaim inventory : newFightNeedProblemInventories) { |
| | | String taskId = inventory.getTaskId(); |
| | | NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId); |
| | | String award = newFightNeedProblemInventory.getAward(); |
| | | sumAward = Long.parseLong(award) + sumAward; |
| | | } |
| | | memberAnalysisVO.setPartyCount(sumAward); |
| | | } |
| | | |
| | |
| | | endTime=year.toString().concat("-12-31"); |
| | | } |
| | | //获取党员活动统计数据 |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId); |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId); |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId,null); |
| | | List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId,null); |
| | | if (partyMemberAnalysisVOS1.size()>0){ |
| | | for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS1) { |
| | | if (ObjectUtils.isNotEmpty(vo)){ |