diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index ca164e8..c894939 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -7,6 +7,9 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.TrackDownDateEnums; import com.lyms.platform.common.enums.TrackDownTransferEnums; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.PageResult; +import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.TrackDownQueryRequest; @@ -92,7 +95,7 @@ public class TrackDownFacade { return downRecordQuery; } - public BaseListResponse list(TrackDownQueryRequest downQueryRequest,Integer userId) { + public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest,Integer userId) { //转换为本地的查询条件 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest,userId); @@ -105,8 +108,13 @@ public class TrackDownFacade { data.add(downTypeHandler.build(trackDownRecord, mongoTemplate)); } } - - return new BaseListResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(downRecordQuery.getPageInfo()); + PageResult pageResult = new PageResult(); + pageResult.setCount(downRecordQuery.getPageInfo().getCount()); + pageResult.setPage(downRecordQuery.getPageInfo().getPage()); + pageResult.setLimit(downRecordQuery.getPageInfo().getLimit()); + pageResult.setGrid(data); + return RespBuilder.buildSuccess(pageResult); +// return new BaseListResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(downRecordQuery.getPageInfo()); } /**