huanghongfa
2021-04-12 d5fa7a28cd6c4e3b62df5c18be0423af2302c2e2
党员活动详情新增社区名称字段
3个文件已修改
18 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -86,6 +86,9 @@
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("活动党员列表")
    private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
@@ -143,4 +143,12 @@
    int updateStatusToActiveOrEnd();
    @Select("select type,name from sys_user where user_id=#{createBy}")
    LoginUserInfoVO selectUserInfoByUserId(Long createBy);
    /**
     * 根据社区id查询社区名称
     * @param communityId   社区id
     * @return  社区名字
     */
    @Select("select name from com_act where community_id=#{communityId}")
    String selectCommunityNameByCommunityId(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -49,6 +49,7 @@
    @Resource
    private ComPbMemberDAO comPbMemberDAO;
    /**
     * 查询某个党员加入的所有党员活动
     *
@@ -158,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);
    }