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/ComPbMemberServiceImpl.java

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

import com.alibaba.fastjson.JSONArray;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,11 +21,8 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
@@ -23,19 +32,6 @@
import com.panzhihua.service_dangjian.service.ComPbMemberService;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -46,6 +42,7 @@
@Slf4j
@Service
public class ComPbMemberServiceImpl extends ServiceImpl<ComPbMemberDAO,ComPbMemberDO> implements ComPbMemberService {
    private final String REDIS_ORG_ALL = "ogrlist";
    @Resource
    private ComPbMemberDAO comPbMemberDAO;
    @Resource
@@ -59,12 +56,11 @@
    @Resource
    private ComPbDynUserDAO comPbDynUserDAO;

    private final String REDIS_ORG_ALL="ogrlist";

    /**
     * 新增党员
     *
     * @param partyBuildingMemberVO 党员基本信息
     * @param partyBuildingMemberVO
     *            党员基本信息
     * @return 新增结果
     */
    @Override
@@ -87,8 +83,7 @@
                    .eq(ComPbMemberDO::getIdCard, partyBuildingMemberVO.getIdCard())
                    .eq(ComPbMemberDO::getUserId, partyBuildingMemberVO.getUserId())
                    .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberVO.getCommunityId())
                    .eq(ComPbMemberDO::getAuditResult, 3)
            );
                .eq(ComPbMemberDO::getAuditResult, 3));
            return R.ok();
        }
        return R.fail();
@@ -97,7 +92,8 @@
    /**
     * 批量新增党员
     *
     * @param list 党员集合
     * @param list
     *            党员集合
     * @return 新增结果
     */
    @Override
@@ -147,16 +143,19 @@
                comPbMemberDO.setUpdateAt(date);
                comPbMemberDO.setCreateAt(date);
                String orgName = partyBuildingMemberExcelVO.getOrgName();
                List<PartyOrganizationVO> collect = partyOrganizationVOArrayList.stream().filter(partyOrganizationVO -> orgName.equals(partyOrganizationVO.getName())).collect(Collectors.toList());
                List<PartyOrganizationVO> collect = partyOrganizationVOArrayList.stream()
                    .filter(partyOrganizationVO -> orgName.equals(partyOrganizationVO.getName()))
                    .collect(Collectors.toList());
                if (ObjectUtils.isEmpty(collect)) {
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName() + "，请先在“党支部管理”中添加该党支部");
                    throw new PartyBuildingMemberException(
                        "导入失败，组织不存在" + partyBuildingMemberExcelVO.getOrgName() + "，请先在“党支部管理”中添加该党支部");
                }else{
                    PartyOrganizationVO partyOrganizationVO = collect.get(0);
                    comPbMemberDO.setOrgId(partyOrganizationVO.getId());
                    comPbMemberDO.setCommunityId(partyOrganizationVO.getCommunityId());

                    List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                            .eq(ComPbMemberDO::getIdCard,partyBuildingMemberExcelVO.getIdCard())
                    List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>()
                        .lambda().eq(ComPbMemberDO::getIdCard, partyBuildingMemberExcelVO.getIdCard())
                            .eq(ComPbMemberDO::getCommunityId,partyOrganizationVO.getCommunityId())
                            .in(ComPbMemberDO::getAuditResult,0,1));
                    if(!comPbMemberDOList.isEmpty()){
@@ -165,16 +164,23 @@
                            this.baseMapper.updateById(comPbMember);
                        });
                        continue;
//                        throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
                        // throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+
                        // partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" +
                        // partyBuildingMemberExcelVO.getName());
                    }
                }

                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime()) && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())){
                    throw new PartyBuildingMemberException("导入失败,您导入的数据中有转正日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getEmploymentTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
                if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())
                    && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())) {
                    throw new PartyBuildingMemberException(
                        "导入失败,您导入的数据中有转正日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getEmploymentTime() + "，错误人名："
                            + partyBuildingMemberExcelVO.getName());
                }

                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime()) && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())){
                    throw new PartyBuildingMemberException("导入失败,您导入的数据中有入党日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getJoinTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
                if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime())
                    && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())) {
                    throw new PartyBuildingMemberException("导入失败,您导入的数据中有入党日期格式错误，错误数据:"
                        + partyBuildingMemberExcelVO.getJoinTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
                }

                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())){
@@ -203,7 +209,8 @@
    /**
     * 分页党员
     *
     * @param pagePartyOrganizationVO 查询信息
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
     */
    @Override
@@ -229,7 +236,8 @@
    /**
     * 编辑党员信息 新增字段均可编辑
     *
     * @param partyBuildingMemberVO 编辑字段
     * @param partyBuildingMemberVO
     *            编辑字段
     * @return 编辑结果
     */
    @Override
@@ -251,7 +259,8 @@
    /**
     * 查询指定社区的所有党员
     *
     * @param communityId 社区id
     * @param communityId
     *            社区id
     * @return 党员列表
     */
    @Override
@@ -276,7 +285,8 @@
    /**
     * 新增党委
     *
     * @param partyCommitteeVO 新增信息
     * @param partyCommitteeVO
     *            新增信息
     * @return 新增结果
     */
    @Override
@@ -300,7 +310,8 @@
    /**
     * 编辑党委
     *
     * @param partyCommitteeVO 编辑信息
     * @param partyCommitteeVO
     *            编辑信息
     * @return 编辑结果
     */
    @Override
@@ -333,7 +344,8 @@
    /**
     * 删除党委
     *
     * @param partyCommitteeVO 删除id
     * @param partyCommitteeVO
     *            删除id
     * @return 删除结果
     */
    @Override
@@ -359,7 +371,8 @@
    /**
     * 分页社区党委查询
     *
     * @param partyCommitteeVO 查询参数
     * @param partyCommitteeVO
     *            查询参数
     * @return 分页集合
     */
    @Override
@@ -385,7 +398,8 @@
    /**
     * 新建党建动态
     *
     * @param partyCommitteeVO 动态内容
     * @param partyCommitteeVO
     *            动态内容
     * @return 新增结果
     */
    @Override
@@ -403,15 +417,18 @@
    /**
     * 编辑动态
     *
     * @param partyCommitteeVO 编辑内容
     * @param partyCommitteeVO
     *            编辑内容
     * @return 编辑结果
     */
    @Override
    public R updateYnamic(PartyBuildingComPbDynVO partyCommitteeVO) {
        ComPbDynDO comPbDynDO=new ComPbDynDO();
        if(partyCommitteeVO.getPublishAt()!=null && partyCommitteeVO.getPublishAt().getTime() >System.currentTimeMillis()){
        if (partyCommitteeVO.getPublishAt() != null
            && partyCommitteeVO.getPublishAt().getTime() > System.currentTimeMillis()) {
            partyCommitteeVO.setStatus(1);
        }else if(partyCommitteeVO.getPublishAt()!=null && partyCommitteeVO.getPublishAt().getTime() < System.currentTimeMillis()){
        } else if (partyCommitteeVO.getPublishAt() != null
            && partyCommitteeVO.getPublishAt().getTime() < System.currentTimeMillis()) {
            partyCommitteeVO.setStatus(2);
        }
        BeanUtils.copyProperties(partyCommitteeVO,comPbDynDO);
@@ -425,7 +442,8 @@
    /**
     * 动态详情
     *
     * @param id 动态主键
     * @param id
     *            动态主键
     * @return 详情
     */
    @Override
@@ -443,7 +461,8 @@
            name="后台发布";
            comPbDynVO.setCreateByName(name);
        }
        //Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        // Integer integer = comPbDynUserDAO.selectCount(new
        // QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        comPbDynVO.setReadingVolume(null==comPbDynVO.getReadingVolume()?0:comPbDynVO.getReadingVolume());
        return R.ok(comPbDynVO);
    }
@@ -451,7 +470,8 @@
    /**
     * 分页查询党员动态
     *
     * @param partyBuildingComPbDynVO 查询参数
     * @param partyBuildingComPbDynVO
     *            查询参数
     * @return 分页数据
     */
    @Override
@@ -484,7 +504,8 @@
    /**
     * 删除动态
     *
     * @param id 动态主键
     * @param id
     *            动态主键
     * @return 删除结果
     */
    @Override
@@ -499,7 +520,8 @@
    /**
     * 增加阅读记录
     *
     * @param comPbDynUserVO 阅读记录
     * @param comPbDynUserVO
     *            阅读记录
     * @return 增加结果
     */
    @Override
@@ -516,7 +538,8 @@
    /**
     * 删除党员
     *
     * @param id 党员主键
     * @param id
     *            党员主键
     * @return 删除结果
     */
    @Override