Skip to content

T
traffic-front
Commit dfffe2bc authored by Mccoy Z Xia's avatar Mccoy Z Xia
Browse files
Options

calendar display

parent 61e550a8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CalendarServiceImpl.java
View file @ dfffe2bc
...@@ -424,10 +424,13 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService ...@@ -424,10 +424,13 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService
resultList.addAll(eventList); resultList.addAll(eventList);
resultList.addAll(config2EventList.stream() resultList.addAll(config2EventList.stream()
.filter(l1 -> eventList.stream() .filter(l1 -> eventList.stream()
.anyMatch(l2 -> !l1.getEntityId().equals(l2.getEntityId()) .anyMatch(l2 ->
&& !l1.getTaskTypeId().equals(l2.getTaskTypeId()) !(
&& DateUtils.isSameDay(l1.getDueDate(), l2.getDueDate()) l1.getEntityId().equals(l2.getEntityId())
)) && l1.getTaskTypeId().equals(l2.getTaskTypeId())
&& DateUtils.isSameDay(l1.getDueDate(), l2.getDueDate())
)
))
.collect(Collectors.toList())); .collect(Collectors.toList()));
return resultList; return resultList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment