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) {