6.9新增登录失败冻结逻辑

liujie

2025-06-09 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb

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

@@ -1135,7 +1135,7 @@
    @Override
    public R serviceStatic(ServiceStaticDTO serviceStaticDTO) {
        ServiceStaticsVO serviceStaticsVO = new ServiceStaticsVO();
        if (serviceStaticDTO.getCheckUnitId() != null)
        if (serviceStaticDTO.getCheckUnitId() != null && serviceStaticDTO.getCheckUnitId()> 0)
        {
            //单位服务统计
            serviceStaticsVO =
@@ -1190,7 +1190,8 @@
        else
        {
            //个人服务统计
            serviceStaticsVO = this.baseMapper.selectStatsUser(serviceStaticDTO.getPhone(), serviceStaticDTO.getYear());


            ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
                    .eq(ComPbMemberDO::getPhone, serviceStaticDTO.getPhone()).last("limit 1"));
            Long checkUnitId = null;
@@ -1198,6 +1199,7 @@
                checkUnitId = comPbMemberDO.getCheckUnitId();
            }

            serviceStaticsVO = this.baseMapper.selectStatsUser(serviceStaticDTO.getPhone(),checkUnitId+"", serviceStaticDTO.getYear());

            List<ServiceDetailStaticsVO> serviceDetailStaticsVOList=this.baseMapper.selectServiceDetailListForPersonal(checkUnitId, serviceStaticDTO.getPhone(),
                    serviceStaticDTO.getYear(), serviceStaticDTO.getServiceType());
@@ -1265,9 +1267,9 @@
        activityVO.setPartyMemberCount(comActDAO.selectUnitCount());
        activityVO.setUnitCount(comActDAO.selectMemberCount());
        //获取单位活动统计数据（邻里圈）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        //获取单位活动统计数据（活动）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        //获取新双挣双评清单任务
        List<UnitActivityAnalysisVO> newTaskList=comActNeighborCircleDAO.getNewTaskList(beginTime, endTime, belongTo,communityId);

@@ -1351,7 +1353,7 @@
                            Integer serviceTimes = item.getServiceTimes();

                            DecimalFormat df2 = new DecimalFormat("#.##");
                            String formattedNumber2 = df2.format(serviceTimes);
                            String formattedNumber2 = df2.format(serviceTime);
                            Double result2 = Double.parseDouble(formattedNumber2);

                            unitActivityAnalysisVOS.get(param.get("index")).setServiceTime(result2);
@@ -1445,7 +1447,7 @@
            Map<String, Long> collectMap = inventories.stream()
                    .collect(Collectors.groupingBy(NewFightNeedProblemClaim::getTaskId, Collectors.counting()));
            long sum = 0l;
            if(unitVO.getAwardSum()!=null || unitVO.getAwardSum()!=0l )
            if(unitVO.getAwardSum()!=null)
            {
                sum=unitVO.getAwardSum();
            }
@@ -1456,37 +1458,48 @@
//                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;
                if(!StringUtils.isEmpty(award) )
                {
                    long i = Long.parseLong(award) * count;
                    sum = sum + i;
                }
            }
            unitVO.setAwardSum(sum);
        }

        //报道党员统计积分
        for (PartyMemberAnalysisVO memberAnalysisVO : partyMemberAnalysisVOS) {
            Long userId = memberAnalysisVO.getMemberId();
            LambdaQueryWrapper<NewFightNeedProblemClaim> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(NewFightNeedProblemClaim::getUserId,userId);
            List<NewFightNeedProblemClaim> newFightNeedProblemInventories = newFightNeedProblemClaimMapper.selectList(wrapper);
            long sumAward = 0l;

            if(memberAnalysisVO.getPartyCount()!=null || memberAnalysisVO.getPartyCount()!=0l )
        for (PartyMemberAnalysisVO memberAnalysisVO : partyMemberAnalysisVOS)
        {
            if(memberAnalysisVO!=null)
            {
                sumAward=memberAnalysisVO.getPartyCount();
            }
                Long userId = memberAnalysisVO.getMemberId();
                LambdaQueryWrapper<NewFightNeedProblemClaim> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(NewFightNeedProblemClaim::getUserId,userId);
                List<NewFightNeedProblemClaim> newFightNeedProblemInventories = newFightNeedProblemClaimMapper.selectList(wrapper);
                long sumAward = 0l;

            for (NewFightNeedProblemClaim inventory : newFightNeedProblemInventories) {
                String taskId = inventory.getTaskId();
                NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId);

                if(newFightNeedProblemInventory!=null && !StringUtils.isEmpty(newFightNeedProblemInventory.getAward()))
                if(memberAnalysisVO.getPartyCount()!=null)
                {
                    String award = newFightNeedProblemInventory.getAward();
                    sumAward = Long.parseLong(award) + sumAward;
                    sumAward=memberAnalysisVO.getPartyCount();
                }

                for (NewFightNeedProblemClaim inventory : newFightNeedProblemInventories) {
                    String taskId = inventory.getTaskId();
                    NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId);

                    if(newFightNeedProblemInventory!=null && !StringUtils.isEmpty(newFightNeedProblemInventory.getAward()))
                    {
                        String award = newFightNeedProblemInventory.getAward();

                        if(!StringUtils.isEmpty(award) )
                        {
                            sumAward = Long.parseLong(award) + sumAward;
                        }
                    }

                }
                memberAnalysisVO.setPartyCount(sumAward);
            }
            memberAnalysisVO.setPartyCount(sumAward);
        }

        //统计总时长和总次数
@@ -1562,6 +1575,15 @@
             //   ListUtil.sortByProperty(unitActivityAnalysisVOS,"");
            }
        }
        else
        {
            //按时长排序
            ListUtil.sortByProperty(unitActivityAnalysisVOS, "serviceTime");
            ListUtil.sortByProperty(partyMemberAnalysisVOS, "serviceTime");

            ListUtil.reverse(unitActivityAnalysisVOS);
            ListUtil.reverse(partyMemberAnalysisVOS);
        }
        //处理分页
        PageVO<List<UnitActivityAnalysisVO>> unitPage=new PageVO<>();
        PageVO<List<PartyMemberAnalysisVO>> memberPage=new PageVO<>();
@@ -1619,9 +1641,9 @@
            endTime=year.toString().concat("-12-31");
        }
        //获取单位活动统计数据（邻里圈）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId,null);
        //获取单位活动统计数据（活动）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId,null);
        if (!unitActivityAnalysisVOS.isEmpty()){
            for (UnitActivityAnalysisVO unitActivityAnalysisVO : unitActivityAnalysisVOS){
                if (ObjectUtils.isNotEmpty(unitActivityAnalysisVO)){