From 4ad4b51a4fb177eafee8a3a355496e7b6c1be662 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 16:24:46 +0800
Subject: [PATCH] 花城 小程序签退打卡获取积分详情报错2
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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..48b2b15 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
@@ -2,11 +2,13 @@
import com.panzhihua.common.model.dtos.partybuilding.NeedProblemInventoryDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
@Slf4j
@RestController
@@ -19,31 +21,48 @@
@GetMapping("/getList")
public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "classifyId", required = false)String classifyId,
+ @RequestParam(value = "status", required = false)String status,
@RequestParam(value = "kind", required = false)String kind,
@RequestParam(value = "userId", required = false)String userId,
- @RequestParam(value = "communityId", required = false)String communityId)
+ @RequestParam(value = "userIds", required = false)String userIds,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "isDisplay", required = false) String isDisplay,
+ @RequestParam(value = "startTime", required = false) Date startTime,
+ @RequestParam(value = "endTime", required = false) Date endTime)
{
- return R.ok(inventoryService.getList(pageNum,pageSize,kind,userId,communityId));
+ return R.ok(inventoryService.getList(pageNum,pageSize,search,classifyId,status,kind,userId,userIds,isDisplay,communityId,startTime,endTime));
}
@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,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) Date startTime,
+ @RequestParam(value = "endTime", required = false) Date endTime)
{
- return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,kind,userId));
+ return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userIds,isDisplay,userId,startTime,endTime));
}
@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")
public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
{
+ if(StringUtils.isEmpty(item.getCommunityId()))
+ {
+ return R.fail("CommunityId 不能为空！");
+ }
return R.ok(inventoryService.addData(item));
}
@@ -59,4 +78,11 @@
return R.ok(inventoryService.expurgateData(id));
}
+
+ @PostMapping("/timedNewFightNeedProblemInventoryHandler")
+ public R timedNewFightNeedProblemInventoryHandler()
+ {
+ return inventoryService.timedNewFightNeedProblemInventoryHandler();
+ }
+
}
--
Gitblit v1.7.1