From 81a00e19f33166f541da16a52a575ae9b6a62b2a Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 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 &gt;= #{patroBeginTime}</if>
             <if test="patroEndTime != null  and patroEndTime != ''"> and patro_end_time &lt;= #{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