三社功能修改

101captain

2022-03-02 0eb263eec26387080f8ab2548b98c955bec6b833

三社功能修改

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectMemberApi.java

@@ -40,7 +40,6 @@
    @ApiOperation("分页查询所有数据")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectAllComActSocialProjectMember(commonPage);
    }

@@ -65,7 +64,6 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        comActSocialProjectMemberVO.setCommunityId(this.getCommunityId());
        return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
    }
    /**
@@ -77,7 +75,6 @@
    @ApiOperation("批量新增数据")
    @PostMapping("/batch")
    public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember) {
        comActSocialMember.setCommunityId(this.getCommunityId());
        return this.communityService.comActSocialMemberInsertBatch(comActSocialMember);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml

@@ -76,7 +76,7 @@
    </select>

    <select id="selectOneById" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO">
        select t.*, t1.`name`, t1.image,t2.phone, t2.`name` as username, t3.name as staffName
        select t.*, t1.`name` as prizeName, t1.image,t2.phone, t2.`name` as username, t3.name as staffName
        from com_act_raffle_record t
        LEFT JOIN com_act_raffle_prize t1 on t.prize_id = t1.id
        left join sys_user t2 on t.user_id = t2.user_id

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml

@@ -50,9 +50,6 @@
            <if test="commonPage.endTime !=null">
                and #{commonPage.endTime} >= t.create_time
            </if>
            <if test="commonPage.paramId !=null">
                and t.parent_id = #{commonPage.paramId}
            </if>
        </where>
        order by t.create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -679,6 +679,7 @@
        }
        ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        if (!ObjectUtils.isEmpty(comActVO)) {
            loginUserInfoVO.setComActVO(comActVO);
            loginUserInfoVO.setCommunityName(comActVO.getName());
        }
        //是否是社区物业人员