From c426fdcccb92bc3ac22c7eb4e34c50ce78e59a55 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 10:15:20 +0800
Subject: [PATCH] 巡检计划条件查询
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java | 2 +-
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 4 ++--
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 14 +++++++++++---
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 9df4bf1..7f4369b 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -2,6 +2,12 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.utils.result.Results;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +35,7 @@
*/
@RestController
@RequestMapping("/app/appPatrolplan")
+@Api(tags = "app宸℃璁″垝")
public class ArdAppPatrolplanController extends BaseController
{
@Autowired
@@ -39,11 +46,12 @@
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
@GetMapping("/list")
- public TableDataInfo list(ArdAppPatrolplan ardAppPatrolplan)
+ @ApiOperation("鏌ヨ鍏ㄩ儴宸℃鍒楄〃")
+ public Results list(ArdAppPatrolplan ardAppPatrolplan)
{
- startPage();
+ PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize());
List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan);
- return getDataTable(list);
+ return Results.succeed(new PageInfo<>(list));
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
index 2e6ff11..00e9453 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
@@ -25,7 +25,7 @@
* @param ardAppPatrolplan app宸℃璁″垝
* @return app宸℃璁″垝闆嗗悎
*/
- public List<ArdAppPatrolplan> selectArdAppPatrolplanList(ArdAppPatrolplan ardAppPatrolplan);
+ public List<ArdAppPatrolplan> selectArdAppPatrolplanList(ArdAppPatrolplan ardAppPatrolplan);
/**
* 鏂板app宸℃璁″垝
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index ad01b9c..59c3331 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -21,11 +21,11 @@
<select id="selectArdAppPatrolplanList" parameterType="ArdAppPatrolplan" resultMap="ArdAppPatrolplanResult">
<include refid="selectArdAppPatrolplanVo"/>
<where>
- <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time = #{patroEndTime}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="cycle != null and cycle != ''"> and cycle = #{cycle}</if>
<if test="planName != null and planName != ''"> and plan_name like '%'||#{planName}||'%'</if>
- <if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time = #{patroBeginTime}</if>
+ <if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time >= #{patroBeginTime}</if>
+ <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{patroEndTime}</if>
</where>
</select>
--
Gitblit v1.9.3