|
@@ -48,15 +48,14 @@ public class DuanJUReportController {
|
|
|
|
|
|
|
|
|
@GetMapping("/getAccountList")
|
|
|
- public Result<Object> getAccountList(String startDate, String endDate) {
|
|
|
+ public Result<Object> getAccountList(String startDate, String endDate, Integer pageNo, Integer pageSize) {
|
|
|
try {
|
|
|
Long start = DateUtils.dateToLong(startDate);
|
|
|
Long end = DateUtils.dateToLong(endDate);
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
requestMap.put("start", start);
|
|
|
requestMap.put("end", end);
|
|
|
- List<JSONObject> data = duanJUReportService.getAccountList(requestMap);
|
|
|
- return Result.OK(data);
|
|
|
+ return duanJUReportService.getAccountList(pageNo, pageSize, requestMap);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -64,15 +63,15 @@ public class DuanJUReportController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/getDuanJuList")
|
|
|
- public Result<Object> getDuanJuList(String startDate, String endDate) {
|
|
|
+ public Result<Object> getDuanJuList(String startDate, String endDate, Integer pageNo, Integer pageSize) {
|
|
|
try {
|
|
|
Long start = DateUtils.dateToLong(startDate);
|
|
|
Long end = DateUtils.dateToLong(endDate);
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
requestMap.put("start", start);
|
|
|
requestMap.put("end", end);
|
|
|
- List<JSONObject> data = duanJUReportService.getDuanJuList(requestMap);
|
|
|
- return Result.OK(data);
|
|
|
+ return duanJUReportService.getDuanJuList(pageNo, pageSize, requestMap);
|
|
|
+
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|