Merge branch 'feature-dingwf-0715' into develop

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

@@ -94,7 +94,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
             EngineerCalendarDTO.Calendar calander = null;
             EngineerCalendarDTO.Calendar calander = null;
             calander = getEmptyCalendar(teamIds.get(0), sDate);
             calander = getEmptyCalendar(teamIds.get(0), sDate);
             if (configs.containsKey(sDate)) {
             if (configs.containsKey(sDate)) {
-                List<EngineerCalendarDTO.Content> contents = calander.getContent();
+                List<EngineerCalendarDTO.Content> contents = new ArrayList<>();
                 // 有配置
                 // 有配置
                 for (CapacityEngineerCalendarEntity e : configs.get(sDate)) {
                 for (CapacityEngineerCalendarEntity e : configs.get(sDate)) {
                     EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
                     EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
@@ -103,6 +103,10 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
                     content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
                     content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
                     contents.add(content);
                     contents.add(content);
                 }
                 }
+                List<EngineerCalendarDTO.Content> mergedList = new ArrayList<>();
+                mergedList.addAll(calander.getContent());
+                mergedList.addAll(contents);
+                calander.setContent(mergedList);
             }
             }
             calendars.add(calander);
             calendars.add(calander);
         }
         }