bug修改

101captain

2022-07-23 179d69e6d1e8f18270e7cf25c0c16bf1a0ac0352

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java

@@ -754,17 +754,19 @@
                log.error("年龄转义失败");
            }
            //查询党员统计数据
            ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberWestDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
            if(statisticsMemberVo != null){
                member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
                member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
                member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
                member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
                member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
                member.setWishCount(statisticsMemberVo.getWishCount());
                member.setEasyCount(statisticsMemberVo.getEasyCount());
                member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
                member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
            if(member.getUserId()!=null&&member.getCommunityId()!=null){
                ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberWestDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
                if(statisticsMemberVo != null){
                    member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
                    member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
                    member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
                    member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
                    member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
                    member.setWishCount(statisticsMemberVo.getWishCount());
                    member.setEasyCount(statisticsMemberVo.getEasyCount());
                    member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
                    member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
                }
            }
        });
        return R.ok(memberPage);