Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java

@@ -231,13 +231,14 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
             timeDTO.setText((String) timeSpans[0]);
             timeDTO.setBegin((String) timeSpans[1]);
             timeDTO.setEnd((String) timeSpans[2]);
-            if (!dayMaps.containsKey(e.getWorkday())) {
-                CapacityQueryOrderRespDTO.CalendarDTO calendarDTO = new CapacityQueryOrderRespDTO.CalendarDTO();
-                calendarDTO.setDate(e.getWorkday());
-                calendarDTO.setWeek(getWeekday(e.getWorkday()));
-                dayMaps.put(e.getWorkday(), calendarDTO);
+            List<CapacityQueryOrderRespDTO.TimeDTO> times = null;
+            CapacityQueryOrderRespDTO.CalendarDTO calendarDTO = null;
+            if (dayMaps.containsKey(e.getWorkday())) {
+                calendarDTO = dayMaps.get(e.getWorkday());
+            } else {
+                calendarDTO = new CapacityQueryOrderRespDTO.CalendarDTO();
             }
-            dayMaps.get(e.getWorkday()).getTimes().add(timeDTO);
+            calendarDTO.getTimes().add(timeDTO);
         }
         return new ArrayList<>(dayMaps.values());
     }