Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

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

@@ -23,9 +23,10 @@
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "userIds", required = false)String userIds,
                                @RequestParam(value = "communityId", required = false)String communityId)
    {
        return R.ok(inventoryService.getList(pageNum,pageSize,search,status,kind,userId,communityId));
        return R.ok(inventoryService.getList(pageNum,pageSize,search,status,kind,userIds,userId,communityId));
    }

    @GetMapping("/getMyJoinNeedProblemList")
@@ -34,15 +35,16 @@
                                      @RequestParam(value = "search", required = false) String search,
                                      @RequestParam(value = "status", required = false) String status,
                                      @RequestParam(value = "kind", required = false) String kind,
                                      @RequestParam(value = "userIds", required = false) String userIds,
                                      @RequestParam(value = "userId", required = false)String userId)
    {
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userId));
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userIds,userId));
    }

    @GetMapping("/getDetails")
    public R getNeedProblemDetails(@RequestParam("id") String id)
    public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds)
    {
        return R.ok(inventoryService.getDetails(id));
        return R.ok(inventoryService.getDetails(id,userIds));
    }

    @PostMapping("/addData")
@@ -63,4 +65,11 @@
        return R.ok(inventoryService.expurgateData(id));
    }


    @GetMapping("/timedNewFightNeedProblemInventoryHandler")
    public R timedNewFightNeedProblemInventoryHandler()
    {
        return inventoryService.timedNewFightNeedProblemInventoryHandler();
    }

}