|
@ -122,7 +122,7 @@ public class ProjectService implements IProjectService{ |
|
|
//查询项目列表
|
|
|
//查询项目列表
|
|
|
List<ProjectVo.QueryProject> projectList = projectDao.queryProjectList(param.getStartTime(), param.getEndTime(), userId); |
|
|
List<ProjectVo.QueryProject> projectList = projectDao.queryProjectList(param.getStartTime(), param.getEndTime(), userId); |
|
|
//获取项目的时间范围
|
|
|
//获取项目的时间范围
|
|
|
if (ObjectUtil.isNotNull(projectList)) { |
|
|
if (CollectionUtil.isNotEmpty(projectList)) { |
|
|
List<Long> projectStartTimeList = projectList.stream().map(ProjectVo.QueryProject::getStartTime).collect(Collectors.toList()); |
|
|
List<Long> projectStartTimeList = projectList.stream().map(ProjectVo.QueryProject::getStartTime).collect(Collectors.toList()); |
|
|
List<Long> projectEndTimeList = projectList.stream().map(ProjectVo.QueryProject::getEndTime).collect(Collectors.toList()); |
|
|
List<Long> projectEndTimeList = projectList.stream().map(ProjectVo.QueryProject::getEndTime).collect(Collectors.toList()); |
|
|
Long maxStartTime = Collections.min(projectStartTimeList); |
|
|
Long maxStartTime = Collections.min(projectStartTimeList); |
|
@ -155,9 +155,11 @@ public class ProjectService implements IProjectService{ |
|
|
//比较参数时间与项目时间
|
|
|
//比较参数时间与项目时间
|
|
|
for (int i = 0; i < dateList.size(); i++) { |
|
|
for (int i = 0; i < dateList.size(); i++) { |
|
|
haveProject.add("0"); |
|
|
haveProject.add("0"); |
|
|
for (int y = 0; y < realDateList.size(); y++) { |
|
|
if (CollectionUtil.isNotEmpty(projectList)) { |
|
|
if (dateList.get(i).equals(realDateList.get(y))){ |
|
|
for (String realDate : realDateList) { |
|
|
haveProject.set(i,"1"); |
|
|
if (dateList.get(i).equals(realDate)) { |
|
|
|
|
|
haveProject.set(i, "1"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|