Merge branch 'feat-dingwf-mvp616' into develop

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

@@ -184,7 +184,6 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
             timeDTO.setText((String) timeSpans[0]);
             timeDTO.setBegin((String) timeSpans[1]);
             timeDTO.setEnd((String) timeSpans[2]);
-            List<CapacityOrderQueryRespDTO.TimeDTO> times = null;
             CapacityOrderQueryRespDTO.CalendarDTO calendarDTO = null;
             if (dayMaps.containsKey(e.getWorkday())) {
                 calendarDTO = dayMaps.get(e.getWorkday());
@@ -196,7 +195,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
             calendarDTO.getTimes().add(timeDTO);
             dayMaps.put(e.getWorkday(), calendarDTO);
         }
-        return new ArrayList<>(dayMaps.values());
+        return new ArrayList<>(dayMaps.values()).stream()
+                .sorted(Comparator.comparing(CapacityOrderQueryRespDTO.CalendarDTO::getDate)).collect(Collectors.toList());
     }
 
     private String getWeekday(String day) {