yumeng 4 miesięcy temu
rodzic
commit
65b1341582

+ 5 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/DuanJUReportController.java

@@ -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();
         }

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IDuanJUReportService.java

@@ -9,9 +9,9 @@ import java.util.Map;
 public interface IDuanJUReportService {
     JSONObject getTotalCharge(Map<String, Object> requestMap);
 
-    List<JSONObject> getAccountList(Map<String, Object> requestMap);
+    Result<Object> getAccountList(Integer pageNo, Integer pageSize, Map<String, Object> requestMap);
 
-    List<JSONObject> getDuanJuList(Map<String, Object> requestMap);
+    Result<Object> getDuanJuList(Integer pageNo, Integer pageSize, Map<String, Object> requestMap);
 
     List<JSONObject> getViodeoList(Map<String, Object> requestMap);
 

+ 9 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/DuanJUReportServiceImpl.java

@@ -23,13 +23,18 @@ public class DuanJUReportServiceImpl implements IDuanJUReportService {
     }
 
     @Override
-    public List<JSONObject> getAccountList(Map<String, Object> requestMap) {
-        return duanJUReportMapper.getAccountList(requestMap);
+    public Result<Object> getAccountList(Integer pageNo, Integer pageSize, Map<String, Object> requestMap) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<JSONObject> accountList = duanJUReportMapper.getAccountList(requestMap);
+        return Result.ok(new PageInfo<>(accountList));
+
     }
 
     @Override
-    public List<JSONObject> getDuanJuList(Map<String, Object> requestMap) {
-        return duanJUReportMapper.getDuanJuList(requestMap);
+    public Result<Object> getDuanJuList(Integer pageNo, Integer pageSize, Map<String, Object> requestMap) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<JSONObject> duanJuList = duanJUReportMapper.getDuanJuList(requestMap);
+        return Result.ok(new PageInfo<>(duanJuList));
     }
 
     @Override