添加event结束状态判断

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -876,7 +876,11 @@ public class MarkDataServiceImpl implements MarkDataService {
     @Override
     public List<JSONObject> searchMarkDataByEvent(Event event) {
         String linkedGroupId = projectService.getProjectByContendId(event.getProjectId(), event.getContendId()).getBrandLinkedGroupId();
-        return searchMarkDataByTime(event.getProjectId(), linkedGroupId, event.getContendId(), event.getStartTime(), event.getEndTime(), EVENT_FETCH_SOURCE);
+        Long endTime = null;
+        if (event.isEndStatus()) {
+            endTime = event.getEndTime();
+        }
+        return searchMarkDataByTime(event.getProjectId(), linkedGroupId, event.getContendId(), event.getStartTime(), endTime, EVENT_FETCH_SOURCE);
     }
 
     @Override