From 5f5e5dbbcd8ab92effb3d8658e9db19d1e0a8dec Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 03 Apr 2023 19:32:00 +0800
Subject: [PATCH] 巡查路线新增，修改调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index be80c42..da55685 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -6,9 +6,11 @@
<select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
SELECT
spt.*,
- spt2.name as patrolTypeName
+ spt2.name as patrolTypeName,
+ route.ROUTE_COORDINATES routeRange
FROM sm_patrol_task spt
left join sm_patrol_type spt2 on spt.task_type = spt2.id
+ LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
WHERE spt.is_deleted = 0
<if test="patrolTask.title !=null and patrolTask.title!=''">
AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
@@ -27,7 +29,7 @@
<!--查询巡查人员统计数据信息-->
<select id="getPatrolTaskStatistic" resultType="cn.gistack.sm.patrol.vo.PatrolTaskStatisticsVO">
SELECT
- spt.patrol_type as patrolType,
+ spt.task_type as patrolType,
spt2.name as patrolTypeName,
count(*) as number
FROM BLADEX.sm_patrol_task spt
@@ -35,4 +37,83 @@
WHERE spt.is_deleted = 0
group by spt.task_type,spt2.name
</select>
+
+ <!--自定义修改巡查任务数据-->
+ <update id="updatePatrolTask">
+ update sm_patrol_task
+ SET
+ <if test="patrolTask.projectId !=null and patrolTask.projectId !=''">
+ project_id = #{patrolTask.projectId},
+ </if>
+ <if test="patrolTask.title !=null and patrolTask.title !=''">
+ title = #{patrolTask.title},
+ </if>
+ <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
+ start_time = #{patrolTask.startTime},
+ </if>
+ <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
+ end_time = #{patrolTask.endTime},
+ </if>
+ <if test="patrolTask.content !=null and patrolTask.content !=''">
+ content = #{patrolTask.content},
+ </if>
+ <if test="patrolTask.toUserId !=null and patrolTask.toUserId !=''">
+ to_user_id = #{patrolTask.toUserId},
+ </if>
+ <if test="patrolTask.routeCoordinates !=null and patrolTask.routeCoordinates !=''">
+ route_coordinates = dmgeo.ST_LineFromText(${patrolTask.routeCoordinates},0),
+ </if>
+ <if test="patrolTask.updateUser !=null and patrolTask.updateUser !=''">
+ update_user = #{patrolTask.updateUser},
+ </if>
+ <if test="patrolTask.status !=null and patrolTask.status !=''">
+ status = #{patrolTask.status},
+ </if>
+ <if test="patrolTask.taskType !=null and patrolTask.taskType !=''">
+ task_type = #{patrolTask.taskType},
+ </if>
+ <if test="patrolTask.patrolGroupItemId !=null and patrolTask.patrolGroupItemId !=''">
+ patrol_group_item_id = #{patrolTask.patrolGroupItemId},
+ </if>
+ <if test="patrolTask.source !=null and patrolTask.source !=''">
+ source = #{patrolTask.source},
+ </if>
+ <if test="patrolTask.state !=null and patrolTask.state !=''">
+ state = #{patrolTask.state},
+ </if>
+ <if test="patrolTask.routeId !=null and patrolTask.routeId !=''">
+ route_id = #{patrolTask.routeId},
+ </if>
+ update_time = #{patrolTask.updateTime}
+ where id=#{patrolTask.id}
+ </update>
+
+ <!--新增-->
+ <insert id="savePatrolTask">
+ INSERT INTO sm_patrol_task
+ (
+ id,title,start_time,end_time,content,to_user_id,
+ route_id,state,source,task_type,project_id,
+ create_dept,create_time,create_user,update_user,update_time,is_deleted,status,
+ patrol_group_item_id,route_coordinates
+ )
+ VALUES
+ (
+ #{patrolTask.id},#{patrolTask.title},#{patrolTask.startTime},#{patrolTask.endTime},#{patrolTask.content},#{patrolTask.toUserId},
+ #{patrolTask.routeId},#{patrolTask.state},#{patrolTask.source},#{patrolTask.taskType},#{patrolTask.projectId},
+ #{patrolTask.createDept},#{patrolTask.createTime},#{patrolTask.createUser},#{patrolTask.updateUser},#{patrolTask.updateTime},
+ #{patrolTask.isDeleted},#{patrolTask.status},
+ #{patrolTask.patrolGroupItemId},dmgeo.ST_LineFromText(${patrolTask.routeCoordinates},0)
+ )
+ </insert>
+
+ <!--自定义查询详情-->
+ <select id="getPatrolTaskById" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
+ select
+ spt.id,spt.title,spt.start_time,spt.end_time,spt.content,spt.to_user_id,
+ spt.route_id,spt.state,spt.source,spt.task_type,spt.project_id,
+ spt.patrol_group_item_id,dmgeo.ST_AsGeoJSON(spt.route_coordinates) AS route_coordinates
+ FROM sm_patrol_task spt
+ where spt.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3