From 9ddf06bee3dbd1dde785e2ac7be808c8ee22d56d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 23 Aug 2021 08:58:44 +0800
Subject: [PATCH] 1.首页接口调整
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 2a0e97e..c103b5d 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -834,8 +834,8 @@
* 公司运营情况进入图表
*/
@PostMapping("/selectTb")
- public R selectTb(String jurisdiction, String enterpriseName, Integer current, Integer size) {
- List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName, current, size);
+ public R<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
+ IPage list =informationService.selectTb(Condition.getPage(query),jurisdiction, enterpriseName);
return R.data(list);
}
@@ -843,8 +843,8 @@
* 公司经济情况进入图表
*/
@PostMapping("/selectJj")
- public R selectJj(String jurisdiction, String enterpriseName, Integer current, Integer size) {
- List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName, current, size);
+ public R<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
+ IPage list = informationService.selectJj(Condition.getPage(query),jurisdiction, enterpriseName);
return R.data(list);
}
@@ -852,8 +852,8 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R selectYw(String jurisdiction, String deptid,Integer current,Integer size) {
- List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid,current,size);
+ public R<IPage> selectYw(String jurisdiction, String deptid, Query query) {
+ IPage list = informationService.selectYw(Condition.getPage(query),jurisdiction, deptid);
return R.data(list);
}
@@ -870,8 +870,8 @@
* 业务统计明细
*/
@PostMapping("/selectDis")
- public R selectDis(String jurisdiction, String deptid, String fid, Integer current, Integer size) {
- List<Map<Object, Object>> list = informationService.selectDis(jurisdiction, deptid, fid, current, size);
+ public R<IPage> selectDis(String jurisdiction, String deptid, String fid, Query query) {
+ IPage list = informationService.selectDis(Condition.getPage(query),jurisdiction, deptid, fid);
return R.data(list);
}
--
Gitblit v1.9.3