From da9d3cd6be3dbd04d638788210437e2af46ca90e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 15 十一月 2023 17:15:34 +0800
Subject: [PATCH] 社区组织共建详情修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index 27f61ae..bc75756 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -71,9 +71,10 @@
                                 @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 = "userId", required = false)String userId,
+                                @RequestParam(value = "communityId", required = false)String communityId)
     {
-        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",getCommunityId()+"");
+        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
     }
 
 
@@ -135,9 +136,11 @@
 
     @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
     @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 newStriveForFeign.getNeedClaimDetails(id);
+        return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
     }
 
     @ApiOperation(value = "任务报名")
@@ -156,9 +159,11 @@
 
     @ApiOperation(value = "取消报名")
     @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 newStriveForFeign.expurgateNeedClaimData(id);
+        return newStriveForFeign.expurgateNeedClaimData(id,taskId,userId);
     }
 
 
@@ -227,14 +232,14 @@
                                       @RequestParam("pageSize") int pageSize)
     {
         return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
-                getCommunityId()+"",getUserId()+"");
+                getCommunityId()+"",null);
     }
 
-    @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
+    @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
     @GetMapping("/getNewFightCommunityDetails")
     public R getNewFightCommunityDetails(@RequestParam("id") String id)
     {
-        return newStriveForFeign.getNewFightCommunityDetails(id);
+        return newStriveForFeign.getNewFightCommunityDetails(id,getUserId()+"");
     }
 
     @ApiOperation(value = "社区共建项目添加")
@@ -253,7 +258,7 @@
 
     @ApiOperation(value = "社区共建项目删除")
     @DeleteMapping("/expurgateNewFightCommunityData")
-    public R expurgateNewFightCommunityData(@RequestParam("id") String id)
+    public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id)
     {
         return newStriveForFeign.expurgateNewFightCommunityData(id);
     }
@@ -299,11 +304,7 @@
     @PostMapping("/editProjectPlanAccomplish")
     public R editProjectPlanAccomplish(@RequestParam("id") String id)
     {
-        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
-        item.setId(id);
-        item.setAffirmTime(new Date());
-        item.setAccomplish("1");
-        return newStriveForFeign.editProjectPlanData(item);
+        return newStriveForFeign.editProjectPlanAccomplish(id);
     }
 
 
@@ -522,7 +523,26 @@
     }
 
 
+    /************************************************************************************************************
+     *
+     *                       资源共享
+     *
+     *************************************************************************************************************/
 
+    @ApiOperation(value = "资源共享列表", response = NewFightResourceSharingDTO.class)
+    @GetMapping("/getResourceSharingList")
+    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
+                                    @RequestParam("pageSize") int pageSize,
+                                    @RequestParam(value = "communityId", required = false)String communityId)
+    {
+        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
+    }
 
+    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
+    @GetMapping("/getResourceSharingDetails")
+    public R getResourceSharingDetails(@RequestParam("id") String id)
+    {
+        return newStriveForFeign.getResourceSharingDetails(id);
+    }
 
 }

--
Gitblit v1.7.1