修改打卡

lidongdong

2023-11-14 ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c

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

@@ -9,6 +9,7 @@

import javax.annotation.Resource;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdcardUtil;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbMemberRoleTypeEnum;
@@ -22,6 +23,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 +39,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;
@@ -75,6 +73,8 @@
    private CommunityWestService communityWestService;
    @Resource
    private UserService userService;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;

    /**
     * 新增党员
@@ -96,6 +96,7 @@
        Date date = new Date();
        comPbMemberWestDO1.setCreateAt(date);
        comPbMemberWestDO1.setUpdateAt(date);
        comPbMemberWestDO1.setId(null);
        int insert = comPbMemberWestDAO.insert(comPbMemberWestDO1);
        if (insert > 0) {
            // 删除已驳回的记录
@@ -269,6 +270,15 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        Long communityId = pagePartyOrganizationVO.getCommunityId();
        if (null != communityId){
            List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
            if (CollUtil.isEmpty(communityIds)) {
                communityIds = new ArrayList<>();
                communityIds.add(communityId);
            }
            pagePartyOrganizationVO.setCommunityIds(communityIds);
        }
        IPage<PartyBuildingMemberVO> iPage = comPbMemberWestDAO.queryAllByLimit(page, pagePartyOrganizationVO);
        iPage.getRecords().forEach(record -> {
            record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
@@ -479,6 +489,7 @@
     */
    @Override
    public R adddYnamic(PartyBuildingComPbDynVO partyCommitteeVO) {
        partyCommitteeVO.setId(null);
        ComPbDynDO comPbDynDO = new ComPbDynDO();
        BeanUtils.copyProperties(partyCommitteeVO, comPbDynDO);
        comPbDynDO.setCreateAt(new Date());
@@ -555,6 +566,21 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        Long communityId = partyBuildingComPbDynVO.getCommunityId();
        if (null != communityId){
            List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
            if (CollUtil.isEmpty(communityIds)) {
                communityIds = new ArrayList<>();
                communityIds.add(communityId);
            }
            partyBuildingComPbDynVO.setCommunityIds(communityIds);
        }else {
            //西区大屏
            if (CollUtil.isEmpty(partyBuildingComPbDynVO.getCommunityIds()) || "wx0cef797390444b75".equals(partyBuildingComPbDynVO.getAppId())){
                List<Long> selectDistinctCommunityId = comPbMemberDAO.selectDistinctCommunityId("西区");
                partyBuildingComPbDynVO.setCommunityIds(selectDistinctCommunityId);
            }
        }
        IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
        List<PartyBuildingComPbDynVO> records = iPage.getRecords();
        if (!(ObjectUtils.isEmpty(records))) {
@@ -577,7 +603,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 +780,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);