From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java
index b71f843..8905b5a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java
@@ -19,26 +19,32 @@
@GetMapping("/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)
{
- return R.ok(inventoryService.getList(pageNum,pageSize,kind,userId,communityId));
+ return R.ok(inventoryService.getList(pageNum,pageSize,search,status,kind,userIds,userId,communityId));
}
@GetMapping("/getMyJoinNeedProblemList")
public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize,
- @RequestParam(value = "kind", required = false)String kind,
- @RequestParam(value = "userId", required = false)String userId)
+ @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)
{
- return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,kind,userId));
+ return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userIds,userId));
}
@GetMapping("/getDetails")
- public R getNeedProblemDetails(@RequestParam("id") String id)
+ public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds)
{
- return R.ok(inventoryService.getDetails(id));
+ return R.ok(inventoryService.getDetails(id,userIds));
}
@PostMapping("/addData")
@@ -59,4 +65,11 @@
return R.ok(inventoryService.expurgateData(id));
}
+
+ @GetMapping("/timedNewFightNeedProblemInventoryHandler")
+ public R timedNewFightNeedProblemInventoryHandler()
+ {
+ return inventoryService.timedNewFightNeedProblemInventoryHandler();
+ }
+
}
--
Gitblit v1.7.1