diff --git a/src/main/java/com/casic/accessControl/event/dto/EventDto.java b/src/main/java/com/casic/accessControl/event/dto/EventDto.java
index 9ff52bb..afc1854 100644
--- a/src/main/java/com/casic/accessControl/event/dto/EventDto.java
+++ b/src/main/java/com/casic/accessControl/event/dto/EventDto.java
@@ -2,7 +2,9 @@
 
 import com.casic.accessControl.event.domain.Event;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by lenovo on 2016/8/11.
@@ -94,4 +96,12 @@
         eventDto.setStatus(event.getStatus());
         return eventDto;
     }
+
+    public static List<EventDto> convert2EventDtoList(List<Event> eventList){
+        List<EventDto> result = new ArrayList<EventDto>();
+        for(Event event:eventList){
+            result.add(convert2EventDto(event));
+        }
+        return result;
+    }
 }

diff --git a/src/main/java/com/casic/accessControl/event/dto/EventDto.java b/src/main/java/com/casic/accessControl/event/dto/EventDto.java
index 9ff52bb..afc1854 100644
--- a/src/main/java/com/casic/accessControl/event/dto/EventDto.java
+++ b/src/main/java/com/casic/accessControl/event/dto/EventDto.java
@@ -2,7 +2,9 @@
 
 import com.casic.accessControl.event.domain.Event;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by lenovo on 2016/8/11.
@@ -94,4 +96,12 @@
         eventDto.setStatus(event.getStatus());
         return eventDto;
     }
+
+    public static List<EventDto> convert2EventDtoList(List<Event> eventList){
+        List<EventDto> result = new ArrayList<EventDto>();
+        for(Event event:eventList){
+            result.add(convert2EventDto(event));
+        }
+        return result;
+    }
 }
diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index f1e6776..6c56a11 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -29,8 +29,9 @@
      * @return
      */
     public List<EventDto> getEventsByTaskId(Long taskId) {
-
-        return null;
+       List<Event> events = this.findBy("taskId",taskId);
+        List<EventDto> eventDtos = EventDto.convert2EventDtoList(events);
+        return eventDtos;
     }
 
     /**
@@ -40,7 +41,9 @@
      * @return
      */
     public EventDto getEventById(Long eventId) {
-        return null;
+        Event event = this.get(eventId);
+        EventDto eventDto = EventDto.convert2EventDto(event);
+        return eventDto;
     }
 
     /**
@@ -50,6 +53,7 @@
      * @return
      */
     public boolean deleteEventById(Long eventId) {
+        this.removeById(eventId);
         return true;
     }