From c96bbb4ce29b4d9f5681e83f2e1f6650ecb84d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=B8=E8=83=9C=E6=8C=AF?= <449117895@qq.com> Date: Sun, 14 Jul 2024 22:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiatmp/server_api/controller/HighDangerController.java | 7 ++++--- .../hisense/hiatmp/server_api/mapper/HighDangerMapper.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 705b456..a1a88f0 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -1,6 +1,7 @@ package com.hisense.hiatmp.server_api.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hisense.hiatmp.model.common.*; import com.hisense.hiatmp.server_api.mapper.HighDangerMapper; @@ -66,10 +67,10 @@ public class HighDangerController { return ServerResponse.error("未找到当前用户"); } - Page page = new Page<>(pageNum, pageSize); - + //Page page = new Page<>(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); // 将要查询的状态和部门id查询数据库，获得隐患排查表 - List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,search); + List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,search); // 待办 /*if("20".equals(highDangerBaseVO.getStatus())){ diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index c21656e..68d0a55 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java @@ -17,7 +17,7 @@ public interface HighDangerMapper extends BaseMapper{ List getStatusCounts(String cdepartmentid); // - List getHigDangerDealt(String status, String cdepartmentid, Page page, String search); + List getHigDangerDealt(String status, String cdepartmentid, String search); List getHigDangerDying(String status, String cdepartmentid);