From 5cd81c86fc3c0d96e28c0bbe5f97126b15a567d8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 15 十一月 2023 16:28:23 +0800
Subject: [PATCH] 社区组织共建状态

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 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 37418fc..b918946 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
@@ -232,7 +232,7 @@
                                       @RequestParam("pageSize") int pageSize)
     {
         return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
-                getCommunityId()+"",getUserId()+"");
+                getCommunityId()+"",null);
     }
 
     @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
@@ -304,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);
     }
 
 
@@ -528,6 +524,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