huanghongfa
2021-01-22 04c96f26282f021fcc59b40d6f11f172fc070af8
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
@@ -97,6 +99,12 @@
        if (ObjectUtils.isEmpty(comPbActivityDO)) {
            return R.fail("活动不存在");
        }
        LoginUserInfoVO loginUserInfoVO=comBpActivityDAO.selectUserInfoByUserId(comPbActivityDO.getCreateBy());
        Integer type = loginUserInfoVO.getType();
        int isPerson=0;
        if (type.intValue()==1) {
            isPerson=1;
        }
        PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO();
        BeanUtils.copyProperties(comPbActivityDO, partyBuildingActivityVO);
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
@@ -124,6 +132,8 @@
            partyBuildingActivityVO.setIsSign(1);
        }
        partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS);
        partyBuildingActivityVO.setIsPerson(isPerson);
        partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName());
        return R.ok(partyBuildingActivityVO);
    }
@@ -222,11 +232,17 @@
            records.forEach(partyBuildingActivityVO1 -> {
                Date activityTimeBegin = partyBuildingActivityVO1.getActivityTimeBegin();
                Integer status = partyBuildingActivityVO1.getStatus();
                String createByName = partyBuildingActivityVO1.getCreateByName();
                if (!ObjectUtils.isEmpty(activityTimeBegin)) {
                    partyBuildingActivityVO1.setActivityTimeBeginFormat(formatTo.format(activityTimeBegin));
                }
                if(status.intValue()==3){
                    partyBuildingActivityVO1.setStatus(4);
                }
                if(!ObjectUtils.isEmpty(createByName)&&createByName.equals("管理员")){
                    partyBuildingActivityVO1.setIsPerson(0);
                }else{
                    partyBuildingActivityVO1.setIsPerson(1);
                }
            });
        }
@@ -414,6 +430,23 @@
        return R.ok();
    }
    /**
     * 创建党员活动 小程序创建党员活动
     *
     * @param comPbActivityDTO 创建内容
     * @return 创建结果
     */
    @Override
    public R addActivityApplets(ComPbActivityDTO comPbActivityDTO) {
        ComPbActivityDO comPbActivityDO=new ComPbActivityDO();
        BeanUtils.copyProperties(comPbActivityDTO,comPbActivityDO);
        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }
    public static void main(String[] args) {
        DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
        String format = formatTo.format(new Date());