Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,5 +1,18 @@
package com.panzhihua.service_dangjian.service.impl;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,18 +33,8 @@
import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -49,23 +52,31 @@
    @Resource
    private ComPbMemberDAO comPbMemberDAO;

    public static void main(String[] args) {
        DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
        String format = formatTo.format(new Date());
        System.out.println(format);
    }

    /**
     * 查询某个党员加入的所有党员活动
     *
     * @param partyBuildingActivityVO 查询参数
     * @param partyBuildingActivityVO
     *            查询参数
     * @return 活动集合
     */
    @Override
    public R listPartyMemberActivities(PartyBuildingActivityVO partyBuildingActivityVO) {
        List<PartyBuildingActivityVO> partyBuildingActivityVOS = comBpActivityDAO.listPartyMemberActivities(partyBuildingActivityVO);
        List<PartyBuildingActivityVO> partyBuildingActivityVOS =
            comBpActivityDAO.listPartyMemberActivities(partyBuildingActivityVO);
        return R.ok(partyBuildingActivityVOS);
    }

    /**
     * 活动报名名单分页查询
     *
     * @param pageActivityMembersVO 查询参数 手机号 名字
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
     */
    @Override
@@ -97,7 +108,8 @@
    /**
     * 党员活动详情
     *
     * @param id 活动id
     * @param id
     *            活动id
     * @return 活动详情内容
     */
    @Override
@@ -116,7 +128,9 @@
        BeanUtils.copyProperties(comPbActivityDO, partyBuildingActivityVO);

        List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        List<ComPbActivityMemberDO> comPbActivityMemberDOS =
            comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda()
                .eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            int size = comPbActivityMemberDOS.size();
            if (size>=6) {
@@ -132,7 +146,9 @@
        }else{
            partyBuildingActivityVO.setParticipationActualNum(0);
        }
        //List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        // List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new
        // QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId,
        // id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
       /* List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
@@ -162,7 +178,8 @@

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

        return R.ok(partyBuildingActivityVO);
@@ -171,7 +188,8 @@
    /**
     * 新增党员活动
     *
     * @param partyBuildingActivityVO 参数
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
     */
    @Override
@@ -198,7 +216,8 @@
    /**
     * 编辑党员活动
     *
     * @param partyBuildingActivityVO 编辑内容
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
     */
    @Override
@@ -215,7 +234,8 @@
    /**
     * 发布党员活动
     *
     * @param id 主键id
     * @param id
     *            主键id
     * @return 发布结果
     */
    @Override
@@ -234,7 +254,8 @@
    /**
     * 删除党员活动
     *
     * @param id 主键id
     * @param id
     *            主键id
     * @return 删除结果
     */
    @Override
@@ -249,7 +270,8 @@
    /**
     * 分页查询党员活动
     *
     * @param partyBuildingActivityVO 查询条件
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
     */
    @Override
@@ -292,7 +314,8 @@
    /**
     * 取消活动
     *
     * @param partyBuildingActivityVO 取消原因
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
     */
    @Override
@@ -311,8 +334,10 @@
    /**
     * 用户的所有党建活动
     *
     * @param userId 用户id
     * @param communityId 社区id
     * @param userId
     *            用户id
     * @param communityId
     *            社区id
     * @return 党建活动列表
     */
    @Override
@@ -322,11 +347,13 @@
        if (ObjectUtils.isEmpty(memberId)) {
            return R.fail();
        }*/
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getUserId, userId));
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(
            new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            return R.fail();
        }
        List<Long> collect = comPbActivityMemberDOS.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList());
        List<Long> collect = comPbActivityMemberDOS.stream()
            .map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList());
        List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect);

        comPbActivityDOS.forEach(comPbActivityDO -> {
@@ -349,7 +376,9 @@
            comActActivityVO.setActivityName(comPbActivityDO.getName());
            comActActivityVO.setCover(comPbActivityDO.getCover());
            comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
            comActActivityVO.setSingDate(comPbActivityMemberDOS.stream().filter(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId().equals(comActActivityVO.getId())).collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVO.setSingDate(comPbActivityMemberDOS.stream()
                .filter(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId().equals(comActActivityVO.getId()))
                .collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);
@@ -358,13 +387,16 @@
    /**
     * 党员活动人员参入列表
     *
     * @param id 活动id
     * @param id
     *            活动id
     * @return 党员集合
     */
    @Override
    public R listPartyBuildingMember(Long id) {
        List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        List<ComPbActivityMemberDO> comPbActivityMemberDOS =
            comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda()
                .eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            comPbActivityMemberDOS.forEach(member->{
                PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
@@ -390,7 +422,8 @@
    /**
     * 报名、取消报名党员活动
     *
     * @param activitySignUpDTO 操作参数
     * @param activitySignUpDTO
     *            操作参数
     * @return 操作结果
     */
    @Override
@@ -406,7 +439,10 @@
            return R.fail("您不是党员");
        }
        Integer type=activitySignUpDTO.getType();
        ComPbActivityMemberDO comPbActivityMemberDO = comPbActivityMemberDAO.selectOne(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, comPbMemberDO.getId()).eq(ComPbActivityMemberDO::getActivityId, id));
        ComPbActivityMemberDO comPbActivityMemberDO =
            comPbActivityMemberDAO.selectOne(new QueryWrapper<ComPbActivityMemberDO>().lambda()
                .eq(ComPbActivityMemberDO::getMemberId, comPbMemberDO.getId())
                .eq(ComPbActivityMemberDO::getActivityId, id));
        boolean empty = ObjectUtils.isEmpty(comPbActivityMemberDO);
        int mum=0;
        if (type.intValue()==1) {
@@ -443,7 +479,8 @@
    /**
     * 获取党建活动所有参入人员的id集合
     *
     * @param id 党建活动id
     * @param id
     *            党建活动id
     * @return 人员id集合
     */
    @Override
@@ -466,7 +503,8 @@
            comPbActivityDOS.forEach(comPbActivityDO -> {
                PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO();
                BeanUtils.copyProperties(comPbActivityDO,partyBuildingActivityVO);
                List<Long> userIdS=comBpActivityDAO.selectTimedTaskPartyBuildingActivityUserids(comPbActivityDO.getId());
                List<Long> userIdS =
                    comBpActivityDAO.selectTimedTaskPartyBuildingActivityUserids(comPbActivityDO.getId());
                partyBuildingActivityVO.setUserIds(userIdS);
                partyBuildingActivityVOS.add(partyBuildingActivityVO);
            });
@@ -500,7 +538,8 @@
    /**
     * 创建党员活动 小程序创建党员活动
     *
     * @param comPbActivityDTO 创建内容
     * @param comPbActivityDTO
     *            创建内容
     * @return 创建结果
     */
    @Override
@@ -511,7 +550,9 @@
        BeanUtils.copyProperties(comPbActivityDTO,comPbActivityDO);
        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert>0) {
            ComPbActivityDO comPbActivityDO1 = comBpActivityDAO.selectOne(new QueryWrapper<ComPbActivityDO>().lambda().eq(ComPbActivityDO::getName, comPbActivityDTO.getName()).eq(ComPbActivityDO::getCover, comPbActivityDTO.getCover()).last(" order by create_at desc limit 1 "));
            ComPbActivityDO comPbActivityDO1 = comBpActivityDAO.selectOne(new QueryWrapper<ComPbActivityDO>().lambda()
                .eq(ComPbActivityDO::getName, comPbActivityDTO.getName())
                .eq(ComPbActivityDO::getCover, comPbActivityDTO.getCover()).last(" order by create_at desc limit 1 "));
            Long comPbActivityDO1Id = comPbActivityDO1.getId();
            ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectByUserId(createBy);
            if (ObjectUtils.isEmpty(comPbMemberDO)) {
@@ -534,18 +575,14 @@

    /**
     * 根据党员活动id查询活动下报名人员
     * @param activityId    党员活动id
     *
     * @param activityId
     *            党员活动id
     * @return  活动下报名人员
     */
    @Override
    public R getTaskPbActivityPeopleList(Long activityId){
        return R.ok(this.comBpActivityDAO.getTaskPbActivityPeopleList(activityId));
    }

    public static void main(String[] args) {
        DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
        String format = formatTo.format(new Date());
        System.out.println(format);
    }

}