Commit 8e99b457 by 丁伟峰

使用PlanId(以前是用数据表的id字段,现在用真正的plan_id字段)

1 parent b98856ce
...@@ -201,7 +201,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService { ...@@ -201,7 +201,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
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()));
content.setPlanId(e.getId().toString()); content.setPlanId(e.getPlanId());
contents.add(content); contents.add(content);
} }
List<EngineerCalendarDTO.Content> mergedList = new ArrayList<>(); List<EngineerCalendarDTO.Content> mergedList = new ArrayList<>();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!