From b26bb88a280687437ecac93544edc7e00e89b1fd Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 29 Sep 2022 08:43:16 +0800
Subject: [PATCH] 任务列表sql添加巡检人员查询、查询时间返回格式修改
---
src/main/java/org/springblade/modules/eventgm/mapper/EventgmMapper.xml | 17 +++++++++++++++--
1 files changed, 15 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..570d578 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"/>
@@ -20,11 +20,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') >= #{eventgm.startTime}
+ </if>
+ <if test="eventgm.endTime !=null and eventgm.endTime !=''">
+ AND DATE_FORMAT(create_time,'%Y-%m-%d') <= #{eventgm.endTime}
+ </if>
</select>
--
Gitblit v1.9.3