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 | 125 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 11 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 d9d5f1a..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
@@ -1,11 +1,11 @@
package com.panzhihua.common.service.partybuilding;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemClaimDTO;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
+import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
*
@@ -46,12 +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);
@@ -69,14 +82,14 @@
*
*******************************************************************************************************/
@GetMapping("/NeedClaim/getNeedClaimList")
- public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize,
- @RequestParam(value = "kind", required = false) String kind,
+ 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);
@@ -85,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")
@@ -118,15 +133,103 @@
public R expurgateNeedTaskData(@RequestParam("id") String id);
+ /*******************************************************************************************************************
+ *
+ * 新双争双评社区共建
+ *
+ ****************************************************************************************************************/
+ @GetMapping("/NewFightCommunity/getNeedClaimList")
+ public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ @GetMapping("/NewFightCommunity/getNeedClaimDetails")
+ public R getNewFightCommunityDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addNeedClaimData")
+ public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
+
+ @PostMapping("/NewFightCommunity/editNeedClaimData")
+ public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateNeedClaimData")
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id);
+
+
+ /**************************************************************************************************************
+ *
+ * 项目规划
+ *
+ ****************************************************************************************************************/
+
+ @GetMapping("/NewFightCommunity/getProjectPlanList")
+ public R getProjectPlanList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getProjectPlanDetails")
+ public R getProjectPlanDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addProjectPlanData")
+ public R addProjectPlanData(@RequestBody NewFightProjectPlanDTO item);
+
+ @PostMapping("/NewFightCommunity/editProjectPlanData")
+ public R editProjectPlanData(@RequestBody NewFightProjectPlanDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateProjectPlanData")
+ public R expurgateProjectPlanData(@RequestParam("id") String id);
+
+
+ /********************************************************************************************************
+ *
+ * 项目参与
+ *
+ ******************************************************************************************************/
+
+
+ @GetMapping("/NewFightCommunity/getJoinList")
+ public R getJoinList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getJoinDetails")
+ public R getJoinDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addJoinData")
+ public R addJoinData(@RequestBody NewFightProjectJoinDTO item);
+
+ @PostMapping("/NewFightCommunity/editJoinData")
+ public R editJoinData(@RequestBody NewFightProjectJoinDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateJoinData")
+ public R expurgateJoinData(@RequestParam("id") String id);
+ /********************************************************************************************************
+ *
+ * 项目评论
+ *
+ ******************************************************************************************************/
+
+ @GetMapping("/NewFightCommunity/getEvaluateList")
+ public R getEvaluateList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getEvaluateDetails")
+ public R getEvaluateDetails(@RequestParam("id") String id);
+ @PostMapping("/NewFightCommunity/addEvaluateData")
+ public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item);
+ @PostMapping("/NewFightCommunity/editEvaluateData")
+ public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item);
-
-
+ @DeleteMapping("/NewFightCommunity/expurgateEvaluateData")
+ public R expurgateEvaluateData(@RequestParam("id") String id);
}
\ No newline at end of file
--
Gitblit v1.7.1