From 9d3b87e655cc3461db4d56fc0a98df9665b682f6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 23 Sep 2022 14:24:56 +0800
Subject: [PATCH] 事件管理、维修管理、巡检计划添加时间查询

---
 src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml           |   16 ++++++++++++++--
 src/main/java/org/springblade/modules/repairsorder/vo/RepairsorderVO.java        |    3 +++
 src/main/java/org/springblade/modules/taskinfo/mapper/TaskinfoPlanMapper.xml     |    6 ++++++
 src/main/java/org/springblade/modules/repairsorder/mapper/RepairsorderMapper.xml |    6 ++++++
 src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.java          |    3 ++-
 src/main/java/org/springblade/modules/taskinfo/vo/TaskinfoPlanVO.java            |    3 +++
 src/main/java/org/springblade/modules/eventgm/vo/EventgmVO.java                  |    3 +++
 7 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.java b/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.java
index 21d811f..51d0d14 100644
--- a/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.java
+++ b/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.eventgm.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.eventgm.entity.EventgmEntity;
 import org.springblade.modules.eventgm.vo.EventgmVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
 	 * @param eventgm
 	 * @return
 	 */
-	List<EventgmVO> selectEventgmPage(IPage page, EventgmVO eventgm);
+	List<EventgmVO> selectEventgmPage(IPage page, @Param("eventgm") EventgmVO eventgm);
 
 
 }
diff --git a/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml b/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml
index 140932a..3e46590 100644
--- a/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml
+++ b/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.eventgm.mapper.EventgmMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="eventgmResultMap" type="org.springblade.modules.eventgm.entity.EventgmEntity">
+    <resultMap id="eventgmResultMap" type="org.springblade.modules.eventgm.vo.EventgmVO">
         <result column="id" property="id"/>
         <result column="type" property="type"/>
         <result column="address" property="address"/>
@@ -24,7 +24,19 @@
 
 
     <select id="selectEventgmPage" resultMap="eventgmResultMap">
-        select * from inv_eventgm where is_deleted = 0
+        select * from ins_eventgm where is_deleted = 0
+        <if test="eventgm.type != null and eventgm.type !=''">
+            AND type = #{eventgm.type}
+        </if>
+        <if test="eventgm.state !=null and eventgm.state !='' ">
+            AND state = #{eventgm.state}
+        </if>
+        <if test="eventgm.startTime !=null and eventgm.startTime !=''">
+            AND DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= #{eventgm.startTime}
+        </if>
+        <if test="eventgm.endTime !=null and eventgm.endTime !=''">
+            AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{eventgm.endTime}
+        </if>
     </select>
 
 
diff --git a/src/main/java/org/springblade/modules/eventgm/vo/EventgmVO.java b/src/main/java/org/springblade/modules/eventgm/vo/EventgmVO.java
index 9cfa05b..33822dc 100644
--- a/src/main/java/org/springblade/modules/eventgm/vo/EventgmVO.java
+++ b/src/main/java/org/springblade/modules/eventgm/vo/EventgmVO.java
@@ -32,4 +32,7 @@
 public class EventgmVO extends EventgmEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String startTime;
+
+	private String endTime;
 }
diff --git a/src/main/java/org/springblade/modules/repairsorder/mapper/RepairsorderMapper.xml b/src/main/java/org/springblade/modules/repairsorder/mapper/RepairsorderMapper.xml
index 9dea687..5215ab5 100644
--- a/src/main/java/org/springblade/modules/repairsorder/mapper/RepairsorderMapper.xml
+++ b/src/main/java/org/springblade/modules/repairsorder/mapper/RepairsorderMapper.xml
@@ -28,6 +28,12 @@
         <if test="repairsorder.no !=null and repairsorder.no !='' ">
             AND no like CONCAT('%',#{repairsorder.no},'%')
         </if>
+        <if test="repairsorder.startTime !=null and repairsorder.startTime !=''">
+            AND DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= #{repairsorder.startTime}
+        </if>
+        <if test="repairsorder.endTime !=null and repairsorder.endTime !=''">
+            AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{repairsorder.endTime}
+        </if>
     </select>
 
     <select id="getRepairsorderMaxNo" resultMap="repairsorderResultMap">
diff --git a/src/main/java/org/springblade/modules/repairsorder/vo/RepairsorderVO.java b/src/main/java/org/springblade/modules/repairsorder/vo/RepairsorderVO.java
index 0f7f9a0..d3f250d 100644
--- a/src/main/java/org/springblade/modules/repairsorder/vo/RepairsorderVO.java
+++ b/src/main/java/org/springblade/modules/repairsorder/vo/RepairsorderVO.java
@@ -32,4 +32,7 @@
 public class RepairsorderVO extends RepairsorderEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String startTime;
+
+	private String endTime;
 }
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskinfoPlanMapper.xml b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskinfoPlanMapper.xml
index d72a6ea..69c4c37 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskinfoPlanMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskinfoPlanMapper.xml
@@ -34,6 +34,12 @@
         <if test="taskinfoPlan.title !=null and taskinfoPlan.title != ''">
             AND title like CONCAT('%',#{taskinfoPlan.title},'%')
         </if>
+        <if test="taskinfoPlan.startCreateTime !=null and taskinfoPlan.startCreateTime !=''">
+            AND DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= #{taskinfoPlan.startCreateTime}
+        </if>
+        <if test="taskinfoPlan.endCreateTime !=null and taskinfoPlan.endCreateTime !=''">
+            AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{taskinfoPlan.endCreateTime}
+        </if>
     </select>
 
     <select id="getMaxNo" resultMap="taskinfoPlanResultMap">
diff --git a/src/main/java/org/springblade/modules/taskinfo/vo/TaskinfoPlanVO.java b/src/main/java/org/springblade/modules/taskinfo/vo/TaskinfoPlanVO.java
index e86a437..c8e5263 100644
--- a/src/main/java/org/springblade/modules/taskinfo/vo/TaskinfoPlanVO.java
+++ b/src/main/java/org/springblade/modules/taskinfo/vo/TaskinfoPlanVO.java
@@ -32,4 +32,7 @@
 public class TaskinfoPlanVO extends TaskinfoPlanEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String startCreateTime;
+
+	private String endCreateTime;
 }

--
Gitblit v1.9.3