Skip to content

yangxiujun / paidan_demo

Go to a project
Commit d6c9225a by 丁伟峰
Options

Merge branch 'feat-dingwf-mvp616' into develop

2 parents a437880c a53e0f8b
Inline Side-by-side
Showing with 2 additions and 2 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java
...@@ -184,7 +184,6 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -184,7 +184,6 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
timeDTO.setText((String) timeSpans[0]); timeDTO.setText((String) timeSpans[0]);
timeDTO.setBegin((String) timeSpans[1]); timeDTO.setBegin((String) timeSpans[1]);
timeDTO.setEnd((String) timeSpans[2]); timeDTO.setEnd((String) timeSpans[2]);
List<CapacityOrderQueryRespDTO.TimeDTO> times = null;
CapacityOrderQueryRespDTO.CalendarDTO calendarDTO = null; CapacityOrderQueryRespDTO.CalendarDTO calendarDTO = null;
if (dayMaps.containsKey(e.getWorkday())) { if (dayMaps.containsKey(e.getWorkday())) {
calendarDTO = dayMaps.get(e.getWorkday()); calendarDTO = dayMaps.get(e.getWorkday());
...@@ -196,7 +195,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -196,7 +195,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
calendarDTO.getTimes().add(timeDTO); calendarDTO.getTimes().add(timeDTO);
dayMaps.put(e.getWorkday(), calendarDTO); 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) { private String getWeekday(String day) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!