Browse Source

查询日历小红点-修复bug

tall3
ma 4 years ago
parent
commit
216aade17a
  1. 10
      signin/src/main/java/com/ccsens/signin/service/ProjectService.java

10
signin/src/main/java/com/ccsens/signin/service/ProjectService.java

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

Loading…
Cancel
Save