Commit f5f7341ecd730f0f27eff08da9ea1475f02c793c
1 parent
4911fb3466
Exists in
master
and in
6 other branches
1
Showing 1 changed file with 11 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
f5f7341
... | ... | @@ -7,6 +7,9 @@ |
7 | 7 | import com.lyms.platform.common.enums.TrackDownDateEnums; |
8 | 8 | import com.lyms.platform.common.enums.TrackDownTransferEnums; |
9 | 9 | import com.lyms.platform.common.result.BaseListResponse; |
10 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
11 | +import com.lyms.platform.common.result.PageResult; | |
12 | +import com.lyms.platform.common.result.RespBuilder; | |
10 | 13 | import com.lyms.platform.common.utils.DateUtil; |
11 | 14 | import com.lyms.platform.common.utils.StringUtils; |
12 | 15 | import com.lyms.platform.operate.web.request.TrackDownQueryRequest; |
... | ... | @@ -92,7 +95,7 @@ |
92 | 95 | return downRecordQuery; |
93 | 96 | } |
94 | 97 | |
95 | - public BaseListResponse list(TrackDownQueryRequest downQueryRequest,Integer userId) { | |
98 | + public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest,Integer userId) { | |
96 | 99 | //转换为本地的查询条件 |
97 | 100 | TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest,userId); |
98 | 101 | |
... | ... | @@ -105,8 +108,13 @@ |
105 | 108 | data.add(downTypeHandler.build(trackDownRecord, mongoTemplate)); |
106 | 109 | } |
107 | 110 | } |
108 | - | |
109 | - return new BaseListResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(downRecordQuery.getPageInfo()); | |
111 | + PageResult pageResult = new PageResult(); | |
112 | + pageResult.setCount(downRecordQuery.getPageInfo().getCount()); | |
113 | + pageResult.setPage(downRecordQuery.getPageInfo().getPage()); | |
114 | + pageResult.setLimit(downRecordQuery.getPageInfo().getLimit()); | |
115 | + pageResult.setGrid(data); | |
116 | + return RespBuilder.buildSuccess(pageResult); | |
117 | +// return new BaseListResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(downRecordQuery.getPageInfo()); | |
110 | 118 | } |
111 | 119 | |
112 | 120 | /** |