Merge branch 'feat-calender' into develop

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

@@ -245,11 +245,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
         calendar.setWeek(DateUtils.toWeekChinese(dayOfWeek));
         calendar.setWeek(DateUtils.toWeekChinese(dayOfWeek));
         EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
         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))) {
-            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.setType("REST");
             content.setTitle("休息");
             content.setTitle("休息");
         }
         }