#feat 修复bug

yanghui

2022-10-20 fa31c6f51e3669e292b06a31be95c6336521a22c

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

@@ -22,6 +22,7 @@
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.*;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -37,10 +38,6 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.*;
import com.panzhihua.service_dangjian.model.dos.*;
import com.panzhihua.service_dangjian.service.ComPbMemberWestService;
@@ -96,6 +93,7 @@
        Date date = new Date();
        comPbMemberWestDO1.setCreateAt(date);
        comPbMemberWestDO1.setUpdateAt(date);
        comPbMemberWestDO1.setId(null);
        int insert = comPbMemberWestDAO.insert(comPbMemberWestDO1);
        if (insert > 0) {
            // 删除已驳回的记录
@@ -479,6 +477,7 @@
     */
    @Override
    public R adddYnamic(PartyBuildingComPbDynVO partyCommitteeVO) {
        partyCommitteeVO.setId(null);
        ComPbDynDO comPbDynDO = new ComPbDynDO();
        BeanUtils.copyProperties(partyCommitteeVO, comPbDynDO);
        comPbDynDO.setCreateAt(new Date());
@@ -577,7 +576,7 @@
     * @return 删除结果
     */
    @Override
    public R deleteYnamic(Integer id) {
    public R deleteYnamic(Long id) {
        int delete = comPbDynDAO.deleteById(id);
        if (delete > 0) {
            return R.ok();
@@ -754,17 +753,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);