From 81a00e19f33166f541da16a52a575ae9b6a62b2a Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: Thu, 03 Aug 2023 13:34:27 +0800
Subject: [PATCH] 巡检计划筛选
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 11 +++++++----
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 30 ++++++++++++++++--------------
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 3 ++-
3 files changed, 25 insertions(+), 19 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 7f4369b..85a8259 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
@@ -46,7 +46,7 @@
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
@GetMapping("/list")
- @ApiOperation("查询全部巡检列表")
+ @ApiOperation("查询全部巡检列表及搜索筛选")
public Results list(ArdAppPatrolplan ardAppPatrolplan)
{
PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize());
@@ -60,6 +60,7 @@
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:export')")
@Log(title = "app巡检计划", businessType = BusinessType.EXPORT)
@PostMapping("/export")
+ @ApiOperation("导出全部巡检列表")
public void export(HttpServletResponse response, ArdAppPatrolplan ardAppPatrolplan)
{
List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan);
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
index 5a39143..8700302 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
@@ -18,29 +18,31 @@
{
private static final long serialVersionUID = 1L;
- /** 结束时间(每天为时分秒，仅一次为年月日时分秒) */
- @Excel(name = "结束时间(每天为时分秒，仅一次为年月日时分秒)")
- private String patroEndTime;
-
- /** 制定人主键 */
- @Excel(name = "制定人主键")
- private String userId;
-
- /** 周期 */
- @Excel(name = "周期")
- private String cycle;
-
/** 主键 */
private String id;
+
+ /** 制定人主键 */
+ private String userId;
+
+ @Excel(name = "制定人")
+ private String nickName;
+
+ /** 周期 */
+ @Excel(name = "周期",readConverterExp = "day=每日,once=单次")
+ private String cycle;
/** 巡检计划名称 */
@Excel(name = "巡检计划名称")
private String planName;
- /** 开始时间(每天为时分秒，仅一次为年月日时分秒) */
- @Excel(name = "开始时间(每天为时分秒，仅一次为年月日时分秒)")
+ /** 开始时间 */
+ @Excel(name = "开始时间")
private String patroBeginTime;
+ /** 结束时间(每天为时分秒，仅一次为年月日时分秒) */
+ @Excel(name = "结束时间")
+ private String patroEndTime;
+
/**
* 巡检点
*/
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 32259ab..8741540 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -12,11 +12,13 @@
<result property="id" column="id" />
<result property="planName" column="plan_name" />
<result property="patroBeginTime" column="patro_begin_time" />
+ <result property="nickName" column="nick_name" />
</resultMap>
<sql id="selectArdAppPatrolplanVo">
select
ard_app_patrolplan.id,
+ sys_user.nick_name,
ard_app_patrolplan.patro_end_time,
ard_app_patrolplan.user_id,
ard_app_patrolplan.cycle,
@@ -31,20 +33,21 @@
<include refid="selectArdAppPatrolplanVo"/>
left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
+ left join sys_user on ard_app_patrolplan.user_id = sys_user.user_id
<where>
- <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ <if test="userId != null and userId != ''"> and ard_app_patrolplan.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="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{patroEndTime}</if>
<if test="wellId != null and wellId != ''">
- and well.alarmpoints_id = (select id from ard_alarmpoints_well where well_id = #{wellId})
+ and well.alarmpoints_id = (select ard_alarmpoints_well.id from ard_alarmpoints_well where well_id = #{wellId})
</if>
<if test="pUser != null and pUser != ''">
- and users.app_user_id = (select user_id from sys_user where nick_name = #{pUser})
+ and users.app_user_id = (select sys_user.user_id from sys_user where nick_name = #{pUser})
</if>
</where>
- group by ard_app_patrolplan.id
+ group by ard_app_patrolplan.id,sys_user.nick_name
</select>
<select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
--
Gitblit v1.9.3