From 62ccdc7c0ca98f50059808f0ecdf01907b92879d Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 10 七月 2024 16:14:16 +0800
Subject: [PATCH] 协助提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
index 3dfbfd2..86cc3c3 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -158,11 +158,11 @@
PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
String userId = SecurityUtils.getUserId();
- List<Map<String,Object>> result = ardTankLockService.getAll(userId);
+ Map<String,Object> result = ardTankLockService.getAll(userId);
TableDataInfo dataTable = new TableDataInfo();
- dataTable.setRows(result);
- dataTable.setTotal(result.size());
+ dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
dataTable.setCode(200);
dataTable.setMsg("鏌ヨ鎴愬姛");
return dataTable;
@@ -250,11 +250,11 @@
PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
ArdTankWall ardTankWall = new ArdTankWall();
ardTankWall.setWallName((String) para.get("wallName"));
- List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
+ Map<String,Object> result = ardTankWallService.selectArdTankWallList(ardTankWall);
TableDataInfo dataTable = new TableDataInfo();
- dataTable.setRows(list);
- dataTable.setTotal(list.size());
+ dataTable.setRows((List<ArdTankWall>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
dataTable.setCode(200);
dataTable.setMsg("鏌ヨ鎴愬姛");
return dataTable;
@@ -278,13 +278,13 @@
String userId = SecurityUtils.getUserId();
List<Map<String,String>> result = ardTankLockService.getLockByCarPlate(userId,para.get("carPlate"));
return getDataTable(result);*/
- PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+ //PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
String userId = SecurityUtils.getUserId();
- List<Map<String,Object>> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"));
+ Map<String,Object> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"),(Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
TableDataInfo dataTable = new TableDataInfo();
- dataTable.setRows(result);
- dataTable.setTotal(result.size());
+ dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
dataTable.setCode(200);
dataTable.setMsg("鏌ヨ鎴愬姛");
return dataTable;
--
Gitblit v1.9.3