Commit 9c1fffb1 by 丁伟峰

根据0803的商议,正常上班的日历不必在日历中显示

1 parent b24e7a6f
......@@ -245,11 +245,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
calendar.setWeek(DateUtils.toWeekChinese(dayOfWeek));
EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
List<String> workdays = Arrays.asList(e.getWorkdays().split(","));
if (workdays.contains(String.valueOf(dayOfWeek))) {
content.setType("WORKING");
content.setTitle(String.format("%s-%s", e.getWorkOn(), e.getWorkOff()));
content.setValue(getCalendarDuration(e.getWorkOn(), e.getWorkOff()));
} else {
if (!workdays.contains(String.valueOf(dayOfWeek))) {
content.setType("REST");
content.setTitle("休息");
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!