diff --git a/smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java b/smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java index 173ffb29a05..1119f042f57 100644 --- a/smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java +++ b/smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java @@ -818,9 +818,17 @@ public ActionGroup(List actions, long totalNumOfActions) { public ActionGroup listActions(long pageIndex, long numPerPage, List orderBy, List isDesc) throws IOException, MetaStoreException { + List infos = metaStore.listPageAction((pageIndex - 1) * numPerPage, + numPerPage, orderBy, isDesc); + for (ActionInfo info : infos) { + ActionInfo memInfo = idToActions.get(info.getActionId()); + if (memInfo != null) { + info.setCreateTime(memInfo.getCreateTime()); + info.setProgress(memInfo.getProgress()); + } + } - return new ActionGroup(metaStore.listPageAction((pageIndex - 1) * numPerPage, - numPerPage, orderBy, isDesc), metaStore.getCountOfAllAction()); + return new ActionGroup(infos, metaStore.getCountOfAllAction()); } public List getActions(long rid, int size) throws IOException {