累计积分

luoxinwu

2023-12-21 a80d56ef9f4d2fd3f1bc08dda23771c652021014

累计积分

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java

@@ -36,5 +36,8 @@

    @ApiModelProperty("报道社区id")
    private String communityId;

    @ApiModelProperty("累计积分")
    private Long awardSum;
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/NewFightNeedProblemClaimMapper.java

New file
@@ -0,0 +1,9 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.entity.NewFightNeedProblemClaim;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface NewFightNeedProblemClaimMapper extends BaseMapper<NewFightNeedProblemClaim> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/NewFightNeedProblemInventoryMapper.java

New file
@@ -0,0 +1,10 @@
package com.panzhihua.service_community.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.entity.NewFightNeedProblemInventory;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface NewFightNeedProblemInventoryMapper extends BaseMapper<NewFightNeedProblemInventory> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/NewFightNeedProblemClaim.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.service_community.entity;

import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
public class NewFightNeedProblemClaim implements Serializable {

    private Long id;

    private String taskId;

    private String userId;

    private Date punchStartTime;

    private Date punchEndTime;

    private String serviceTime;

    private Date creationTime;

    private Date updateTime;

    private String unitId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/NewFightNeedProblemInventory.java

New file
@@ -0,0 +1,11 @@
package com.panzhihua.service_community.entity;

import lombok.Data;

@Data
public class NewFightNeedProblemInventory {

    private Long id;

    private String award;
}

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

@@ -3,8 +3,6 @@
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.PageUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.PageUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,6 +18,8 @@
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import com.panzhihua.service_community.entity.NewFightNeedProblemClaim;
import com.panzhihua.service_community.entity.NewFightNeedProblemInventory;
import com.panzhihua.service_community.entity.SysUser;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
@@ -28,16 +28,14 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static com.panzhihua.common.utlis.PayUtil.makeUUID;

/**
 * @auther lyq
@@ -85,6 +83,10 @@
    private ComPbCheckUnitDao comPbCheckUnitDao;
    @Resource
    private SysUserDao sysUserDao;
    @Autowired
    private NewFightNeedProblemClaimMapper newFightNeedProblemClaimMapper;
    @Autowired
    private NewFightNeedProblemInventoryMapper newFightNeedProblemInventoryMapper;
    /**
     * 分页查询邻里圈列表
     *
@@ -1225,6 +1227,28 @@
                }
            }
        }
        //统计积分
        for (UnitActivityAnalysisVO unitVO : unitActivityAnalysisVOS) {

            Long unitId1 = unitVO.getUnitId();
            LambdaQueryWrapper<NewFightNeedProblemClaim> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(NewFightNeedProblemClaim::getUnitId,String.valueOf(unitId1));
            List<NewFightNeedProblemClaim> inventories = newFightNeedProblemClaimMapper.selectList(wrapper);
            Map<String, Long> collectMap = inventories.stream()
                    .collect(Collectors.groupingBy(NewFightNeedProblemClaim::getTaskId, Collectors.counting()));
            long sum = 0L;
            //任务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();
                Long count = collectMap.get(taskId);
                long i = Long.parseLong(award) * count;
                sum = sum + i;
            }
            unitVO.setAwardSum(sum);
        }

        //统计总时长和总次数
        Integer unitServiceCount=0;
        Integer unitServiceTotalTime=0;

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

@@ -343,7 +343,8 @@
            populationSpecial.setGlTotal(comActDAO.getPopulationAge(streetId,80));
            vo.setSpecialStatisticsVo(populationSpecial);
        }
        return R.ok(populationSpecial);
        vo.setSpecialStatisticsVo(populationSpecial);
        return R.ok(vo);
    }

    @Override