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/taskinfo/mapper/TaskInfoMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
index 8c4f15e..1a54958 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
@@ -21,10 +21,48 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
- <select id="getTaskInfoOne" resultMap="taskinfoResultMap">
- select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,
- state,source,create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo
- where id = #{id} and is_deleted = 0
+
+ <resultMap id="taskinfoResultMapList" type="org.springblade.modules.taskinfo.vo.TaskInfoVO">
+ <result column="id" property="id"/>
+ <result column="title" property="title"/>
+ <result column="start_time" property="startTime"/>
+ <result column="end_time" property="endTime"/>
+ <result column="content" property="content"/>
+ <result column="to_user_id" property="toUserId"/>
+ <result column="route_range" property="routeRange"/>
+ <result column="state" property="state"/>
+ <result column="source" property="source"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
+ <collection property="eventgmList" javaType="java.util.List" ofType="org.springblade.modules.eventgm.vo.EventgmVO">
+ <result column="eventId" property="id"/>
+ <result column="eventType" property="type"/>
+ <result column="eventState" property="state"/>
+ <result column="eventAddress" property="address"/>
+ <result column="eventLongitude" property="longitude"/>
+ <result column="eventLatitude" property="latitude"/>
+ <result column="eventPicUrls" property="picUrls" typeHandler="org.springblade.common.handler.JsonStringArrayTypeHandler"/>
+ <result column="eventSource" property="source"/>
+ <result column="eventNo" property="no"/>
+ <result column="eventRemark" property="remark"/>
+ </collection>
+ </resultMap>
+
+ <select id="getTaskInfoOne" resultMap="taskinfoResultMapList">
+ select task.id,task.title,task.start_time,task.end_time,task.content,task.to_user_id,ST_ASTEXT(task.route_range) as route_range,
+ task.state,task.source,task.create_user,task.create_time,task.update_user,task.update_time,task.status,task.create_dept,task.is_deleted,
+ event.id eventId,
+ event.type eventType,
+ event.state eventState,
+ event.address eventAddress,event.longitude eventLongitude,event.latitude eventLatitude,
+ event.pic_urls eventPicUrls,event.source eventSource,event.no eventNo,event.remark eventRemark
+ from ins_taskinfo task
+ LEFT JOIN ins_eventgm event ON event.taskinfo_id = task.id
+ where task.id = #{id} and task.is_deleted = 0
</select>
<select id="selectTaskInfoPage" resultMap="taskinfoResultMap">
--
Gitblit v1.9.3