calendar display

dfffe2bc · Mccoy Z Xia · 61e550a8 · dfffe2bc
Commit dfffe2bc authored Jul 15, 2019 by Mccoy Z Xia
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

CalendarServiceImpl.java ...va/pwc/taxtech/atms/service/impl/CalendarServiceImpl.java +7 -4

No files found.
--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/CalendarServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/CalendarServiceImpl.java
@@ -424,10 +424,13 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService
        resultList.addAll(eventList);
        resultList.addAll(config2EventList.stream()
                .filter(l1 -> eventList.stream()
-                        .anyMatch(l2 -> !l1.getEntityId().equals(l2.getEntityId())
-                                && !l1.getTaskTypeId().equals(l2.getTaskTypeId())
-                                && DateUtils.isSameDay(l1.getDueDate(), l2.getDueDate())
-                                ))
+                        .anyMatch(l2 ->
+                                !(
+                                        l1.getEntityId().equals(l2.getEntityId())
+                                        && l1.getTaskTypeId().equals(l2.getTaskTypeId())
+                                        && DateUtils.isSameDay(l1.getDueDate(), l2.getDueDate())
+                                )
+                        ))
                .collect(Collectors.toList()));
        return resultList;
    }