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

lidongdong

2024-03-20 362ad90924f469cc17b79b0411f633515b84651f

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9952,12 +9952,15 @@
     * 单位活动统计
     */
    @GetMapping("/neighbor/activityAnalysis")
    R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
                                       @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
    R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,
                                       @RequestParam(value = "type",required = false) Integer type,
                                       @RequestParam(value = "range",required = false)Integer range,
                                       @RequestParam(value = "communityId",required = false) Long communityId,
                                       @RequestParam(value = "page",required = false) Integer page,
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo,
                                       @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
                                       @RequestParam(value = "unitId",required = false) Long unitId,
                                       @RequestParam(value = "loginAccount",required = false) String loginAccount);

    @GetMapping("/neighbor/export")
    public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -420,8 +420,10 @@
     * @return
     * */
    @GetMapping("/activityAnalysis")
    public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
    public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,
                                              @RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "range",required = false)Integer range,
                                              @RequestParam(value = "communityId",required = false) Long communityId,
                                              @RequestParam(value = "page",required = false) Integer page,
                                              @RequestParam(value = "belongTo",required = false) String  belongTo,
                                              @RequestParam(value = "size",required = false) Integer size,

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

@@ -1242,7 +1242,7 @@
            List<NewFightNeedProblemClaim> inventories = newFightNeedProblemClaimMapper.selectList(wrapper);
            Map<String, Long> collectMap = inventories.stream()
                    .collect(Collectors.groupingBy(NewFightNeedProblemClaim::getTaskId, Collectors.counting()));
            long sum = 0L;
            long sum = unitVO.getAwardSum();
            //任务id集合
            List<String> taskIds = inventories.stream().map(NewFightNeedProblemClaim::getTaskId).distinct().collect(Collectors.toList());
            for (String taskId : taskIds) {
@@ -1262,7 +1262,7 @@
            LambdaQueryWrapper<NewFightNeedProblemClaim> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(NewFightNeedProblemClaim::getUserId,userId);
            List<NewFightNeedProblemClaim> newFightNeedProblemInventories = newFightNeedProblemClaimMapper.selectList(wrapper);
            long sumAward = 0L;
            long sumAward = memberAnalysisVO.getPartyCount();
            for (NewFightNeedProblemClaim inventory : newFightNeedProblemInventories) {
                String taskId = inventory.getTaskId();
                NewFightNeedProblemInventory newFightNeedProblemInventory = newFightNeedProblemInventoryMapper.selectById(taskId);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml

@@ -603,10 +603,10 @@
    </select>
    <select id="institutionalUnitActivityAnalysis"
            resultType="com.panzhihua.common.model.vos.neighbor.UnitActivityAnalysisVO">
        SELECT sum(serviceTimes) AS serviceTimes, sum(serviceTime) as serviceTime, unitId, communityId, belong_to
        SELECT sum(serviceTimes) AS serviceTimes, sum(serviceTime) as serviceTime, unitId, communityId, belong_to, sum(award) as awardSum
        FROM (
            SELECT count(caa.check_unit_id) as serviceTimes,sum(caa.duration) as serviceTime,caa.check_unit_id as
            unitId,caa.community_id as communityId,cpcu.belong_to
            unitId,caa.community_id as communityId,cpcu.belong_to,caa.pb_reward_integral as award
            FROM com_act_activity as caa
            left join com_pb_check_unit as cpcu on caa.check_unit_id=cpcu.id
            where caa.`status` = 5 AND caa.check_unit_id&lt;>''
@@ -625,7 +625,7 @@
            SELECT count(id) as serviceTimes, sum(duration) as serviceTime, check_unit_id as unitId, community_id as
            communityId, belong_to
            FROM(
            SELECT caa.id, caa.duration, s.check_unit_id , cpcu.community_id , cpcu.belong_to
            SELECT caa.id, caa.duration, s.check_unit_id , cpcu.community_id , cpcu.belong_to,caa.pb_reward_integral as award
            FROM com_act_activity caa
            LEFT JOIN com_act_act_regist s ON caa.id = s.activity_id
            left join com_pb_check_unit as cpcu on s.check_unit_id = cpcu.id
@@ -646,9 +646,10 @@
    <select id="institutionalPartyMemberServiceAnalysis"
            resultType="com.panzhihua.common.model.vos.neighbor.PartyMemberAnalysisVO">
        SELECT count(id) as serviceTimes, sum(duration) as serviceTime, unitId,unitName,orgName,
        communityId, memberId, memberName, belongUnit, belongCommunity, belongTo FROM (
        communityId, memberId, memberName, belongUnit, belongCommunity, belongTo,sum(award) as partyCount
        FROM (
            SELECT caa.id, caa.duration, cpcu.id as unitId,cpcu.name as unitName,cpcu.org_name as orgName, cpcu.community_id as communityId, su.user_id as
            memberId, su.name as memberName, su.relation_name as belongUnit, ca.name as belongCommunity, cpcu.belong_to belongTo
            memberId, su.name as memberName, su.relation_name as belongUnit, ca.name as belongCommunity, cpcu.belong_to belongTo,caa.pb_reward_integral as award
            FROM `com_act_activity` as caa
            left join com_act_act_regist as caar on caa.id=caar.activity_id
            left join sys_user as su on caar.user_id=su.user_id