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/NeedProblemClaimApi.java

@@ -17,19 +17,20 @@
    private NeedProblemClaimService claimService;

    @GetMapping("/getNeedClaimList")
    public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
    public R getNeedClaimList(
                     @RequestParam(value = "taskId", required = false) String taskId,
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "unitId", required = false) String unitId)
    {
        return R.ok(claimService.getList(pageNum,pageSize,taskId,userId,unitId));
        return R.ok(claimService.getList(taskId,userId,unitId));
    }

    @GetMapping("/getNeedClaimDetails")
    public R getNeedClaimDetails(@RequestParam("id") String id)
    public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
                                 @RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestParam(value = "userId", required = false) String userId)
    {
        return R.ok(claimService.getDetails(id));
        return R.ok(claimService.getDetails(id, taskId, userId));
    }

    @PostMapping("/addNeedClaimData")
@@ -45,9 +46,11 @@
    }

    @DeleteMapping("/expurgateNeedClaimData")
    public R expurgateNeedClaimData(@RequestParam("id") String id)
    public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
                                    @RequestParam(value = "taskId", required = false) String taskId,
                                    @RequestParam(value = "userId", required = false) String userId)
    {
        return claimService.expurgateData(id);
        return claimService.expurgateData(id,taskId,userId);
    }