修改金汇社区资源清单筛选

lidongdong

2023-12-08 eb61ca85ef0f8c91afadfcf7763b307b87ac9a97

修改金汇社区资源清单筛选

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

@@ -541,9 +541,11 @@
    @GetMapping("/getResourceSharingList")
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "communityId", required = false)String communityId)
                                    @RequestParam(value = "communityId", required = false)String communityId,
                                    @RequestParam(value = "unitId", required = false)String unitId,
                                    @RequestParam(value = "meritId", required = false) String meritId)
    {
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
    }

    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -250,7 +250,8 @@
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "communityId", required = false)String communityId,
                                    @RequestParam(value = "unitId", required = false)String unitId);
                                    @RequestParam(value = "unitId", required = false)String unitId,
                                    @RequestParam(value = "meritId", required = false) String meritId);

    @GetMapping("/ResourceSharing/getResourceSharingDetails")
    public R getResourceSharingDetails(@RequestParam("id") String id);

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

@@ -137,9 +137,10 @@
    @GetMapping("/ResourceSharing/getResourceSharingList")
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "unitId", required = false)String unitId)
                                    @RequestParam(value = "unitId", required = false)String unitId,
                                    @RequestParam(value = "meritId", required = false) String meritId)
    {
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,null,unitId);
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,null,unitId,meritId);
    }

    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java

@@ -22,8 +22,10 @@
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
                     @RequestParam(value = "communityId", required = false)String communityId,
                     @RequestParam(value = "unitId", required = false)String unitId) {
        return R.ok(sharingService.getList(pageNum, pageSize, communityId, unitId));
                     @RequestParam(value = "unitId", required = false) String unitId,
                     @RequestParam(value = "meritId", required = false) String meritId)
    {
        return R.ok(sharingService.getList(pageNum, pageSize, communityId, unitId,meritId));
    }

    @GetMapping("/getResourceSharingDetails")

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

@@ -19,7 +19,8 @@

    IPage<NewFightResourceSharingDTO> getList(Page page,
                                              @Param("communityId") String communityId,
                                              @Param("unitId") String unitId);
                                              @Param("unitId") String unitId,
                                              @Param("meritId") String meritId);

    NewFightResourceSharingDTO getDetails(@Param("id")String id);


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightResourceSharingService.java

@@ -13,7 +13,8 @@
public interface NewFightResourceSharingService
{

    IPage<NewFightResourceSharingDTO> getList(int pageNum, int pageSize,String communityId,String unitId);
    IPage<NewFightResourceSharingDTO> getList(int pageNum, int pageSize,
                                              String communityId,String unitId,String meritId);

    NewFightResourceSharingDTO getDetails(String id);


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

@@ -22,10 +22,10 @@


    @Override
    public IPage<NewFightResourceSharingDTO> getList(int pageNum, int pageSize, String communityId, String unitId)
    public IPage<NewFightResourceSharingDTO> getList(int pageNum, int pageSize, String communityId, String unitId,String meritId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page,communityId,unitId);
        return baseMapper.getList(page,communityId,unitId,meritId);
    }

    @Override

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

@@ -27,6 +27,9 @@
            <if test="unitId !=null and unitId != '' ">
                and unit_id=#{unitId}
            </if>
            <if test=" meritId !=null and meritId != '' ">
                and INSTR(merit_id,#{meritId})
            </if>
        </where>
    </select>