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/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 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 a24936f..8ff4c6f 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
@@ -27,6 +27,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
@Slf4j
@@ -79,9 +81,24 @@
@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 = "communityId", required = false)String communityId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime)
{
- return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId);
+ Date start=null;
+ Date end=null;
+
+ try {
+ if(!StringUtils.isEmpty(startTime)) {
+ start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
+ }
+ if(!StringUtils.isEmpty(startTime)) {
+ end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,"1",start,end);
}
@@ -91,9 +108,28 @@
@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 = "kind", required = false)String kind,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime)
{
- return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
+ Date start=null;
+ Date end=null;
+
+ try {
+ if(!StringUtils.isEmpty(startTime)) {
+ start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
+ }
+ if(!StringUtils.isEmpty(startTime)) {
+ end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+
+
+ return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
}
@@ -192,10 +228,12 @@
@ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
@GetMapping("/getNeedTaskList")
public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageNum") int pageSize,
- @RequestParam(value = "unitId", required = false) String unitId)
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "kind", required = false) String kind,
+ @RequestParam(value = "status", required = false) String status)
{
- return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
+ return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind,status);
}
@ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
--
Gitblit v1.7.1