From 3cc5256ecb6f34d0bfe0e13903f8a87cf5fcce91 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期五, 28 六月 2024 11:15:56 +0800 Subject: [PATCH] 花城 需求清单列表新增显示隐藏字段 新增认领人数字段 新增时间段筛选功能 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 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..229f45b 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); } -- Gitblit v1.7.1