From 4e6d844f4e117dd8d22ab812c907dd3c759400d1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 13:41:21 +0800
Subject: [PATCH] 新增问题清单列表 详情增加搜索 是否打卡 是否参加字段
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 f91e79c..67cbf5a 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
@@ -58,10 +58,12 @@
@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)
{
- return newStriveForFeign.getNeedProblemList(pageNum,pageSize,kind,userId,getCommunityId()+"");
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",getCommunityId()+"");
}
@@ -69,9 +71,11 @@
@GetMapping("/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)
{
- return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,kind,getUserId()+"");
+ return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
}
@@ -80,7 +84,7 @@
@GetMapping("/NeedProblem/getDetails")
public R getNeedProblemDetails(@RequestParam("id") String id)
{
- return newStriveForFeign.getNeedProblemDetails(id);
+ return newStriveForFeign.getNeedProblemDetails(id,getUserId()+"");
}
@ApiOperation(value = "新增任务需求")
@@ -114,11 +118,11 @@
@GetMapping("/getNeedClaimList")
public R getNeedClaimList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "kind", required = false) String kind,
+ @RequestParam(value = "taskId", required = false) String taskId,
@RequestParam(value = "userId", required = false) String userId,
@RequestParam(value = "unitId", required = false) String unitId)
{
- return newStriveForFeign.getNeedClaimList(pageNum,pageSize,kind,userId,unitId);
+ return newStriveForFeign.getNeedClaimList(pageNum,pageSize,taskId,userId,unitId);
}
@ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
--
Gitblit v1.7.1