修改党员双报到 列表积分不显示7

lidongdong

2024-03-20 5e54ae1ab930f9218dccbf2978b98bbcae137fa8

修改党员双报到  列表积分不显示7

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1242,18 +1242,22 @@
            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);
        }

        //报道党员统计积分
@@ -1262,14 +1266,20 @@
            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;
//            }
//            memberAnalysisVO.setPartyCount(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);
        }

        //统计总时长和总次数