党员活动关系表增加党员姓名头像快照字段

Null

2021-03-10 c52f79aa9a167940bc90633689fe4c7626fc3cc4

党员活动关系表增加党员姓名头像快照字段

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java

@@ -32,20 +32,19 @@
//            " </where>" +
//            "</script>")

    @Select("<script> " +
            "SELECT\n" +
            "m.id,\n" +
            "me.NAME,\n" +
            "u.phone,\n" +
            "m.create_at registrationTime \n" +
            "FROM\n" +
            "com_pb_activity_member m\n" +
            "JOIN com_pb_member me ON m.member_id = me.id\n" +
            "LEFT JOIN sys_user u ON me.id_card = u.id_card \n" +
            "WHERE\n" +
            "m.activity_id = #{pageActivityMembersVO.activityId} \n" +
    @Select("<script>  " +
            "SELECT " +
            " m.id," +
            " m.NAME," +
            " u.phone," +
            " m.create_at registrationTime" +
            " FROM " +
            " com_pb_activity_member m " +
            " LEFT JOIN sys_user u ON m.user_id = u.user_id " +
            "WHERE " +
            "m.activity_id = #{pageActivityMembersVO.activityId} " +
            "<if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != &quot;&quot;'>" +
            "AND me.`name` = #{pageActivityMembersVO.name} \n" +
            "AND m.`name` = #{pageActivityMembersVO.name} " +
            " </if> " +
            "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{pageActivityMembersVO.phone}" +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java

@@ -39,6 +39,16 @@
    private Long userId;

    /**
     * 姓名
     */
    private String name;

    /**
     * 头像图片路径
     */
    private String photoPath;

    /**
     * 报名时间
     */
    @TableField(fill = FieldFill.INSERT)

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

@@ -109,8 +109,26 @@
        }
        PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO();
        BeanUtils.copyProperties(comPbActivityDO, partyBuildingActivityVO);
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));

        List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        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) {
                comPbActivityMemberDOS = comPbActivityMemberDOS.subList(0,6);
            }
            comPbActivityMemberDOS.forEach(member->{
                PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
                BeanUtils.copyProperties(member, partyBuildingMemberVO);
                partyBuildingMemberVO.setCreateAt(member.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
            partyBuildingActivityVO.setParticipationActualNum(comPbActivityMemberDOS.size());
        }else{
            partyBuildingActivityVO.setParticipationActualNum(0);
        }
        //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());
            int size = collect.size();
@@ -126,7 +144,7 @@
            partyBuildingActivityVO.setParticipationActualNum(size);
        } else {
            partyBuildingActivityVO.setParticipationActualNum(0);
        }
        }*/
        ComPbActivityMemberDO comPbActivityMemberDO=comPbActivityMemberDAO.selectByUserIdActivityId(id,userId);
        if (ObjectUtils.isEmpty(comPbActivityMemberDO)) {
            partyBuildingActivityVO.setIsSign(0);
@@ -328,6 +346,14 @@
        List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        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();
                BeanUtils.copyProperties(member, partyBuildingMemberVO);
                partyBuildingMemberVO.setCreateAt(member.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
        }
        /*if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
            List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().in(ComPbMemberDO::getId, collect));
            comPbMemberDOS.forEach(comPbMemberDO -> {
@@ -337,7 +363,7 @@
                partyBuildingMemberVO.setCreateAt(comPbActivityMemberDO1.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
        }
        }*/
        return R.ok(partyBuildingMemberVOS);
    }

@@ -368,6 +394,10 @@
                ComPbActivityMemberDO comPbActivityMemberDO1=new ComPbActivityMemberDO();
                comPbActivityMemberDO1.setActivityId(id);
                comPbActivityMemberDO1.setMemberId(comPbMemberDO.getId());
                comPbActivityMemberDO1.setUserId(userId);
                //添加参加活动的党员快照信息，防止党员信息删除后无法显示
                comPbActivityMemberDO1.setName(comPbMemberDO.getName());
                comPbActivityMemberDO1.setPhotoPath(comPbMemberDO.getPhotoPath());
                comPbActivityMemberDO1.setCreateAt(new Date());
                mum=comPbActivityMemberDAO.insert(comPbActivityMemberDO1);
            } else {