From 4e97c398243b00e05d8d68e850dcd69c42b0cc76 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 10 May 2023 10:30:10 +0800
Subject: [PATCH] 巡检任务增加水库名字段；添加查询水库详情的接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 e4c769a..51fd8df 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,10 +6,12 @@
<select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
SELECT
spt.*,spt2.name as patrolTypeName,
- route.ROUTE_COORDINATES routeRange
+ route.ROUTE_COORDINATES routeRange,
+ u.real_name toUserName
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
+ LEFT JOIN blade_user u ON u.id = spt.to_user_id
WHERE spt.is_deleted = 0
<if test="patrolTask.title !=null and patrolTask.title!=''">
AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
@@ -23,6 +25,9 @@
<if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
AND spt.project_id = #{patrolTask.projectId}
</if>
+ <if test="patrolTask.reservoirName !=null and patrolTask.reservoirName !='' ">
+ AND spt.reservoir_name LIKE ('%',#{patrolTask.reservoirName},'%')
+ </if>
<if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
AND spt.to_user_id = #{patrolTask.toUserId}
</if>
--
Gitblit v1.9.3