Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 663091b6 by 丁伟峰
Options

Merge branch 'feat-dingwf-mvp616' into develop

2 parents 3506f546 a33b8f01
Inline Side-by-side
Showing with 7 additions and 6 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java
...@@ -231,13 +231,14 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -231,13 +231,14 @@ 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]);
if (!dayMaps.containsKey(e.getWorkday())) { List<CapacityQueryOrderRespDTO.TimeDTO> times = null;
CapacityQueryOrderRespDTO.CalendarDTO calendarDTO = new CapacityQueryOrderRespDTO.CalendarDTO(); CapacityQueryOrderRespDTO.CalendarDTO calendarDTO = null;
calendarDTO.setDate(e.getWorkday()); if (dayMaps.containsKey(e.getWorkday())) {
calendarDTO.setWeek(getWeekday(e.getWorkday())); calendarDTO = dayMaps.get(e.getWorkday());
dayMaps.put(e.getWorkday(), calendarDTO); } else {
calendarDTO = new CapacityQueryOrderRespDTO.CalendarDTO();
} }
dayMaps.get(e.getWorkday()).getTimes().add(timeDTO); calendarDTO.getTimes().add(timeDTO);
} }
return new ArrayList<>(dayMaps.values()); return new ArrayList<>(dayMaps.values());
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!