From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
index b1b990d..fbc03fb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -46,19 +46,25 @@
     @GetMapping("/NeedProblem/getList")
     public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
                                 @RequestParam("pageSize") int pageSize,
+                                @RequestParam(value = "search", required = false)String search,
+                                @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);
 
     @GetMapping("/NeedProblem/getMyJoinNeedProblemList")
     public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
                                       @RequestParam("pageSize") int pageSize,
+                                      @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);
 
 
     @GetMapping("/NeedProblem/getDetails")
-    public R getNeedProblemDetails(@RequestParam("id") String id);
+    public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds);
 
     @PostMapping("/NeedProblem/addData")
     public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item);
@@ -76,14 +82,14 @@
      *
      *******************************************************************************************************/
     @GetMapping("/NeedClaim/getNeedClaimList")
-    public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
-                              @RequestParam("pageSize") int pageSize,
-                              @RequestParam(value = "taskId", required = false) String taskId,
+    public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
                               @RequestParam(value = "userId", required = false) String userId,
                               @RequestParam(value = "unitId", required = false) String unitId);
 
     @GetMapping("/NeedClaim/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);
 
     @PostMapping("/NeedClaim/addNeedClaimData")
     public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item);
@@ -92,7 +98,9 @@
     public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item);
 
     @DeleteMapping("/NeedClaim/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);
 
 
     @GetMapping("/NeedClaim/needClaimSignIn")
@@ -146,7 +154,7 @@
     public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
 
     @DeleteMapping("/NewFightCommunity/expurgateNeedClaimData")
-    public R expurgateNewFightCommunityData(@RequestParam("id") String id);
+    public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id);
 
 
     /**************************************************************************************************************
@@ -222,7 +230,6 @@
 
     @DeleteMapping("/NewFightCommunity/expurgateEvaluateData")
     public R  expurgateEvaluateData(@RequestParam("id") String id);
-
 
 
 }
\ No newline at end of file

--
Gitblit v1.7.1