修改bug

huanghongfa

2021-06-21 4105f520eaf7e1875a3d314dbaacf78064d07d35

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

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.ComBpActivityDAO;
import com.panzhihua.service_dangjian.dao.ComPbActivityMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
@@ -48,6 +49,7 @@
    @Resource
    private ComPbMemberDAO comPbMemberDAO;


    /**
     * 查询某个党员加入的所有党员活动
     *
@@ -81,6 +83,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageActivityMembersVO> iPage = comPbActivityMemberDAO.pageActivityMembers(page, pageActivityMembersVO);
        iPage.getRecords().forEach(record->{
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
        });
        Map<String,Object> map=new HashMap<>(3);
        ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(activityId);
        map.put("page",iPage);
@@ -154,6 +159,12 @@
        partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS);
        partyBuildingActivityVO.setIsPerson(isPerson);
        partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName());

        //查询社区名称
        if(partyBuildingActivityVO.getCommunityId() != null){
            partyBuildingActivityVO.setCommunityName(comBpActivityDAO.selectCommunityNameByCommunityId(partyBuildingActivityVO.getCommunityId()));
        }

        return R.ok(partyBuildingActivityVO);
    }

@@ -167,7 +178,16 @@
    public R addactivity(PartyBuildingActivityVO partyBuildingActivityVO) {
        ComPbActivityDO comPbActivityDO = new ComPbActivityDO();
        BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO);
        comPbActivityDO.setCreateAt(new Date());
        Date now = new Date();
        comPbActivityDO.setEnrollTimeBegin(now);
        comPbActivityDO.setCreateAt(now);

        Integer status = partyBuildingActivityVO.getStatus();
        if(status!=null && status.intValue()==2) {//点击'保存并发布' 按钮
            //默认设置为“进行中”
            comPbActivityDO.setStatus(4);
        }

        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert > 0) {
            return R.ok();
@@ -501,6 +521,9 @@
            comPbActivityMemberDO.setMemberId(comPbMemberDOId);
            comPbActivityMemberDO.setActivityId(comPbActivityDO1Id);
            comPbActivityMemberDO.setCreateAt(new Date());
            comPbActivityMemberDO.setUserId(comPbActivityDTO.getCreateBy());
            comPbActivityMemberDO.setName(comPbMemberDO.getName());
            comPbActivityMemberDO.setPhotoPath(comPbMemberDO.getPhotoPath());
            comPbActivityMemberDAO.insert(comPbActivityMemberDO);
            return R.ok();
        }