项目状态看板--时间轴数据
This commit is contained in:
+8
-1
@@ -67,7 +67,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
|
|||||||
public List<Map<String,Object>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
|
public List<Map<String,Object>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
|
||||||
|
|
||||||
// QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
|
// QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
//项目库信息
|
//项目库信息
|
||||||
List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
|
List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
|
||||||
List<List<TimeNodeVO>> list = new ArrayList<>();
|
List<List<TimeNodeVO>> list = new ArrayList<>();
|
||||||
@@ -83,6 +83,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
|
|||||||
//时间段筛选,过滤数据
|
//时间段筛选,过滤数据
|
||||||
String startTime = projectLibraryBase.getStartTime();
|
String startTime = projectLibraryBase.getStartTime();
|
||||||
String endTime = projectLibraryBase.getEndTime();
|
String endTime = projectLibraryBase.getEndTime();
|
||||||
|
if(StringUtils.isNotBlank(startTime)){
|
||||||
|
startTime = projectLibraryBase.getStartTime()+"-0";
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(endTime)){
|
||||||
|
endTime = projectLibraryBase.getEndTime()+"-32";
|
||||||
|
}
|
||||||
|
|
||||||
List<List<TimeNodeVO>> listNew = new ArrayList<>();
|
List<List<TimeNodeVO>> listNew = new ArrayList<>();
|
||||||
if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
|
if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
|
||||||
for (List<TimeNodeVO> timeNodeVOS : list) {
|
for (List<TimeNodeVO> timeNodeVOS : list) {
|
||||||
|
|||||||
Reference in New Issue
Block a user