Merge branch 'feat-calender' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java

@@ -243,13 +243,13 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
         calendar.setDate(date);
         calendar.setDate(date);
         int dayOfWeek = LocalDate.parse(date).getDayOfWeek().getValue();
         int dayOfWeek = LocalDate.parse(date).getDayOfWeek().getValue();
         calendar.setWeek(DateUtils.toWeekChinese(dayOfWeek));
         calendar.setWeek(DateUtils.toWeekChinese(dayOfWeek));
-        EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
         List<String> workdays = Arrays.asList(e.getWorkdays().split(","));
         List<String> workdays = Arrays.asList(e.getWorkdays().split(","));
         if (!workdays.contains(String.valueOf(dayOfWeek))) {
         if (!workdays.contains(String.valueOf(dayOfWeek))) {
+            EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
             content.setType("REST");
             content.setType("REST");
             content.setTitle("休息");
             content.setTitle("休息");
-        }
             calendar.setContent(Collections.singletonList(content));
             calendar.setContent(Collections.singletonList(content));
+        }
         return calendar;
         return calendar;
     }
     }
 }
 }