From c17ffce2cfe55605e0b9fdd465503347c3f584d3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 10 Oct 2022 16:13:49 +0800
Subject: [PATCH] 任务管理和事件关联，事件添加任务id字段；事件添加title字段

---
 src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

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..d8f43d6 100644
--- a/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml
+++ b/src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml
@@ -3,8 +3,9 @@
 <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="title" property="title"/>
         <result column="type" property="type"/>
         <result column="address" property="address"/>
         <result column="longitude" property="longitude"/>
@@ -20,11 +21,24 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="tenant_id" property="tenantId"/>
         <result column="create_dept" property="createDept"/>
+        <result column="pic_urls" property="picUrls" typeHandler="org.springblade.common.handler.JsonStringArrayTypeHandler"/>
     </resultMap>
 
 
     <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>
 
 

--
Gitblit v1.9.3