|
@@ -487,7 +487,7 @@ public class FixedFlowController extends BladeController {
|
|
|
@GetMapping("/getFixedFlowPage")
|
|
|
@ApiOperationSupport(order = 2)
|
|
|
@ApiOperation(value = "分页", notes = "传入fixedFlow")
|
|
|
- public List<Map<String, Object>> getFixedFlowPage(PageFixedFlowDTO dto) {
|
|
|
+ public R<Page<Map<String, Object>>> getFixedFlowPage(PageFixedFlowDTO dto) {
|
|
|
Page<FixedFlow> page = new Page<>(dto.getCurrent(), dto.getSize());
|
|
|
IPage<FixedFlow> fixedFlowsPage = fixedFlowService.getBaseMapper().selectPage(page,
|
|
|
Wrappers.<FixedFlow>lambdaQuery()
|
|
@@ -541,9 +541,14 @@ public class FixedFlowController extends BladeController {
|
|
|
result.add(map);
|
|
|
}
|
|
|
}
|
|
|
- return result;
|
|
|
+ Page<Map<String, Object>> resultMap = new Page<>();
|
|
|
+ resultMap.setCurrent(fixedFlowsPage.getCurrent());
|
|
|
+ resultMap.setSize(fixedFlowsPage.getSize());
|
|
|
+ resultMap.setTotal(fixedFlowsPage.getTotal());
|
|
|
+ resultMap.setRecords(result);
|
|
|
+ return R.data(resultMap);
|
|
|
}
|
|
|
- return null;
|
|
|
+ return R.fail("暂无数据");
|
|
|
}
|
|
|
@GetMapping("/getFixedFlow")
|
|
|
@ApiOperationSupport(order = 25)
|