From bdc340b2594dccd1349c5a848b3a285d2c489133 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 11:20:12 +0800
Subject: [PATCH] 巡检计划搜索联查

---
 ard-work/pom.xml                                                             |    6 +++
 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml            |   20 +++++++++
 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java |   66 ++++++--------------------------
 3 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 524efa1..15c0e8c 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -167,6 +167,12 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>3.0.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
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 9cd8478..5a39143 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
@@ -1,5 +1,7 @@
 package com.ruoyi.app.patrolplan.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,6 +13,7 @@
  * @author ard
  * @date 2023-08-02
  */
+@Data
 public class ArdAppPatrolplan extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -38,60 +41,17 @@
     @Excel(name = "寮�濮嬫椂闂�(姣忓ぉ涓烘椂鍒嗙锛屼粎涓�娆′负骞存湀鏃ユ椂鍒嗙)")
     private String patroBeginTime;
 
-    public void setPatroEndTime(String patroEndTime) 
-    {
-        this.patroEndTime = patroEndTime;
-    }
+    /**
+     * 宸℃鐐�
+     */
+    @TableField(exist = false)
+    private String wellId;
 
-    public String getPatroEndTime() 
-    {
-        return patroEndTime;
-    }
-    public void setUserId(String userId) 
-    {
-        this.userId = userId;
-    }
-
-    public String getUserId() 
-    {
-        return userId;
-    }
-    public void setCycle(String cycle) 
-    {
-        this.cycle = cycle;
-    }
-
-    public String getCycle() 
-    {
-        return cycle;
-    }
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setPlanName(String planName) 
-    {
-        this.planName = planName;
-    }
-
-    public String getPlanName() 
-    {
-        return planName;
-    }
-    public void setPatroBeginTime(String patroBeginTime) 
-    {
-        this.patroBeginTime = patroBeginTime;
-    }
-
-    public String getPatroBeginTime() 
-    {
-        return patroBeginTime;
-    }
+    /**
+     * 宸℃浜哄憳
+     */
+    @TableField(exist = false)
+    private String pUser;
 
     @Override
     public String toString() {
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 59c3331..32259ab 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -15,18 +15,36 @@
     </resultMap>
 
     <sql id="selectArdAppPatrolplanVo">
-        select patro_end_time, user_id, cycle, create_time, id, plan_name, patro_begin_time from ard_app_patrolplan
+        select
+            ard_app_patrolplan.id,
+            ard_app_patrolplan.patro_end_time,
+            ard_app_patrolplan.user_id,
+            ard_app_patrolplan.cycle,
+            ard_app_patrolplan.create_time,
+            ard_app_patrolplan.plan_name,
+            ard_app_patrolplan.patro_begin_time
+        from
+            ard_app_patrolplan
     </sql>
 
     <select id="selectArdAppPatrolplanList" parameterType="ArdAppPatrolplan" resultMap="ArdAppPatrolplanResult">
         <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
         <where>  
             <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 &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})
+            </if>
+            <if test="pUser != null  and pUser != ''">
+                and users.app_user_id = (select user_id from sys_user where nick_name = #{pUser})
+            </if>
         </where>
+            group by ard_app_patrolplan.id
     </select>
     
     <select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">

--
Gitblit v1.9.3