update

张天森

2022-11-12 9c5dc5fc738a172686eaa3cc5fc475a03114a101

update

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java

@@ -83,6 +83,7 @@
    @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
    @PostMapping("/page")
    public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
        log.info("================appId="+comEventPageRequestVO);
        ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
        comEventPageRequestVO.setCreateBy(getUserId());
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());

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

@@ -672,11 +672,11 @@
    @ApiOperation(value = "分页查询物业党员先锋", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteamProperty")
    public R pageServiceTeamProperty(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
        if(nonNull(this.getLoginUserInfo().getStreetId())) {
            pageComPbServiceTeamDTO.setStreetId(this.getLoginUserInfo().getStreetId());
        } else {
            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        }
//        if(nonNull(this.getLoginUserInfo().getStreetId())) {
//            pageComPbServiceTeamDTO.setStreetId(this.getLoginUserInfo().getStreetId());
//        } else {
//            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
//        }
        //获取物业id
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        R<LoginUserInfoVO> r = userService.detailUser(loginUserInfo.getUserId());

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

@@ -42,4 +42,6 @@
        + " where community_id = ${communityId}" + "<if test='param != null and param != &quot;&quot;'>"
        + " and name LIKE concat( #{param}, '%' ) \n" + " </if> " + "</script>")
    List<ComPbServiceTeamVO> getTotlePerson(@Param("param") String param, @Param("communityId") Long communityId);

    IPage<ComPbServiceTeamVO> pageServiceTeamProperty(Page page, @Param("pageComPbServiceTeamDTO")PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
}

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

@@ -118,6 +118,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO);
        if (nonNull(pageComPbServiceTeamDTO.getPropertyId())){
        iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
        }
        return R.ok(iPage);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml

@@ -39,6 +39,16 @@
            AND t1.job LIKE concat( #{pageComPbServiceTeamDTO.job}, '%')
        </if>
    </select>
    <select id="pageServiceTeamProperty"
            resultType="com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO">
        select * from com_pb_service_team where property_id=#{pageComPbServiceTeamDTO.propertyId
        <if test="pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name != ''">
            AND name like concat('%',#{pageComPbServiceTeamDTO.name},'%')
        </if>
        <if test="pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job != ''">
            AND name like concat('%',#{pageComPbServiceTeamDTO.job},'%')
        </if>
    </select>

</mapper>