From 775524110885e27fe860be1feb156ca78b5040b2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 06 七月 2024 14:10:57 +0800
Subject: [PATCH] 电子围栏分页查询修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java | 2 +-
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 6 +++---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java | 11 +++++++++--
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml | 7 +++++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java | 2 ++
5 files changed, 22 insertions(+), 6 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..25a4e20 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
@@ -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;
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
index 2cb362c..444ee50 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
@@ -64,4 +64,6 @@
public List<ArdTankWall> getAllArdTankWall();
public List<Map<String,String>> getArdTankWallByLockId(String id);
+
+ public Long selectArdTankWallTotal(String wallName);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
index d4d3c0a..194a21f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
@@ -27,7 +27,7 @@
* @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
* @return 鐢电閿佺數瀛愬洿鏍忛泦鍚�
*/
- public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall);
+ public Map<String,Object> selectArdTankWallList(ArdTankWall ardTankWall);
/**
* 鏂板鐢电閿佺數瀛愬洿鏍�
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
index a6ad35a..1773afc 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.service.impl;
+import java.util.HashMap;
import java.util.List;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -49,8 +50,14 @@
* @return 鐢电閿佺數瀛愬洿鏍�
*/
@Override
- public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall) {
- return ardTankWallMapper.selectArdTankWallList(ardTankWall);
+ public Map<String,Object> selectArdTankWallList(ArdTankWall ardTankWall) {
+ List<ArdTankWall> result = ardTankWallMapper.selectArdTankWallList(ardTankWall);
+ Long total = ardTankWallMapper.selectArdTankWallTotal(ardTankWall.getWallName());
+ Map<String,Object> resultMap = new HashMap();
+ resultMap.put("list",result);
+ resultMap.put("total",total);
+ return resultMap;
+ //return ardTankWallMapper.selectArdTankWallList(ardTankWall);
}
/**
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
index 7d5e3d7..73dbb28 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -74,4 +74,11 @@
inner join ard_tank_wall atw on atwl.wall_id = atw.id
where atwl.lock_id = #{id}
</select>
+
+ <select id="selectArdTankWallTotal" parameterType="java.lang.String" resultType="java.lang.Long">
+ select count(*) from ard_tank_wall atw
+ <where>
+ <if test="wallName != null and wallName != ''"> and wall_name like '%'||#{wallName}||'%'</if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3