From f0895cbb85ba7a3922342d233e0d04cc266cae21 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 May 2022 17:17:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF--=E6=97=B6=E9=97=B4=E8=BD=B4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectStatusBoardServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 6f2bff04b..4dc9d84d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -67,7 +67,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService public List> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //项目库信息 List projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase); List> list = new ArrayList<>(); @@ -83,6 +83,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService //时间段筛选,过滤数据 String startTime = projectLibraryBase.getStartTime(); String endTime = projectLibraryBase.getEndTime(); + if(StringUtils.isNotBlank(startTime)){ + startTime = projectLibraryBase.getStartTime()+"-0"; + } + if(StringUtils.isNotBlank(endTime)){ + endTime = projectLibraryBase.getEndTime()+"-32"; + } + List> listNew = new ArrayList<>(); if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){ for (List timeNodeVOS : list) {