From 3c6d5513dfaff0c08f3cc94811fabd10d5ac57da Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 12 Oct 2022 08:42:16 +0800
Subject: [PATCH] 事件管理服务层添加@Transactional注解
---
src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 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 d152c01..59deafa 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
@@ -21,16 +21,58 @@
<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,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">
- 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,is_deleted from ins_taskinfo where is_deleted = 0
+ 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 is_deleted = 0
<if test="taskinfo.title != null and taskinfo.title != '' ">
and title like concat('%',#{taskinfo.title},'%')
+ </if>
+ <if test="taskinfo.state != null and taskinfo.state != '' ">
+ and state = #{taskinfo.state}
+ </if>
+ <if test="taskinfo.toUserId != null and taskinfo.toUserId != '' ">
+ and to_user_id = #{taskinfo.toUserId}
</if>
<if test="taskinfo.startTime != null ">
and start_time >= #{taskinfo.startTime}
@@ -40,9 +82,9 @@
</if>
</select>
- <!--自定义新增农场围栏数据-->
+ <!--自定义新增数据-->
<insert id="saveTask">
- INSERT INTO ins_taskinfo (id, title, start_time, end_time, content,to_user_id
+ INSERT INTO ins_taskinfo (id, title, start_time, end_time, content,to_user_id,
<if test="taskInfo.routeRange!=null and taskInfo.routeRange!=''">
route_range,
</if>
@@ -54,7 +96,7 @@
ST_GeomFromText(${taskInfo.routeRange}),
</if>
#{taskInfo.state},#{taskInfo.source},#{taskInfo.createUser},#{taskInfo.createDept},#{taskInfo.createTime},
- #{taskInfo.updataUser},#{taskInfo.updateTime},#{taskInfo.status},#{taskInfo.isDeleted},#{taskInfo.tenantId})
+ #{taskInfo.updateUser},#{taskInfo.updateTime},#{taskInfo.status},#{taskInfo.isDeleted},#{taskInfo.tenantId})
</insert>
<update id="updateTask">
--
Gitblit v1.9.3