From 3e9e8ac9eaa19e253d7128d7503d1d2aac9628d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 04 Apr 2023 09:03:27 +0800
Subject: [PATCH] 巡查任务逻辑调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 3 ++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 2 +-
2 files changed, 3 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 da55685..2c424d7 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
@@ -5,7 +5,8 @@
<!--自定义分页查询-->
<select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
SELECT
- spt.*,
+ spt.id,spt.title,spt.start_time,spt.end_time,spt.content,spt.to_user_id,spt.state,spt.source,spt.project_id,spt.task_type,spt.PATROL_GROUP_ITEM_ID,
+ dmgeo.ST_AsGeoJSON(spt.route_coordinates) AS route_coordinates,
spt2.name as patrolTypeName,
route.ROUTE_COORDINATES routeRange
FROM sm_patrol_task spt
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
index afdbc0f..a65de0d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -44,10 +44,10 @@
*/
@Override
public Boolean updatePatrolTask(PatrolTask patrolTask) {
- Integer update = baseMapper.updatePatrolTask(patrolTask);
// 设置基础信息
EnhancementServicesTool enhancementServicesTool = new EnhancementServicesTool();
enhancementServicesTool.resolveEntity(patrolTask);
+ Integer update = baseMapper.updatePatrolTask(patrolTask);
//返回
return update>0?true:false;
}
--
Gitblit v1.9.3