Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 7c5a9935 by 丁伟峰
Options

Merge branch 'feature-dingwf-0715' into develop

2 parents a113690f 7d9487b1
Inline Side-by-side
Showing with 2 additions and 2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
...@@ -94,14 +94,14 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService { ...@@ -94,14 +94,14 @@ 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 = new ArrayList<>(); List<EngineerCalendarDTO.Content> contents = calander.getContent();
// 有配置 // 有配置
for (CapacityEngineerCalendarEntity e : configs.get(sDate)) { for (CapacityEngineerCalendarEntity e : configs.get(sDate)) {
EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content(); EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
content.setType("leave"); content.setType("leave");
content.setTitle(e.getType()); content.setTitle(e.getType());
content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime())); content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
calander.getContent().add(content); contents.add(content);
} }
} }
calendars.add(calander); calendars.add(calander);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!