From 382a0bfc97e948b851a6be793e87081c776e4cfc Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 18 四月 2024 10:56:46 +0800
Subject: [PATCH] 巡检计划

---
 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml            |   10 ++++++----
 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java |    8 +++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

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 a4867f8..1593b6e 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
@@ -15,7 +15,7 @@
 
 /**
  * app宸℃璁″垝瀵硅薄 ard_app_patrolplan
- * 
+ *
  * @author ard
  * @date 2023-08-02
  */
@@ -81,6 +81,12 @@
 
     private String son;
 
+    @TableField(exist = false)
+    private String createTimeBegin;
+
+    @TableField(exist = false)
+    private String createTimeEnd;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 19f4175..6c689b2 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper">
-    
+
     <resultMap type="ArdAppPatrolplan" id="ArdAppPatrolplanResult">
         <result property="patroEndTime"    column="patro_end_time"    />
         <result property="userId"    column="user_id"    />
@@ -40,6 +40,8 @@
             <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="createTimeBegin != null  and createTimeBegin != ''"> and ard_app_patrolplan.create_time &gt;= #{createTimeBegin} </if>
+            <if test="createTimeEnd != null  and createTimeEnd != ''"> and ard_app_patrolplan.create_time &lt;= #{createTimeEnd}</if>
             <if test="wellId != null  and wellId != ''">
 <!--                and well.alarmpoints_id in (select ard_alarmpoints_well.id from ard_alarmpoints_well where well_id = #{wellId})-->
                 and well.alarmpoints_id = #{wellId}
@@ -51,12 +53,12 @@
         </where>
             group by ard_app_patrolplan.id
     </select>
-    
+
     <select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
         <include refid="selectArdAppPatrolplanVo"/>
         where patro_end_time = #{patroEndTime}
     </select>
-        
+
     <insert id="insertArdAppPatrolplan" parameterType="ArdAppPatrolplan">
         insert into ard_app_patrolplan
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -165,4 +167,4 @@
             and plan.create_time &gt;= #{beforeTime} and  plan.create_time &lt;= #{time}
           and del_name is null and del_time is null order by plan.create_time desc;
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3