From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
index dbb4ebc..2809043 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -38,10 +38,11 @@
record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.create_time,record.update_time,record.solution,
task.route_coordinates taskRoute,task.title taskName,
item.items_name itemsName,item.description,
- u.real_name
+ u.real_name,res."name" resName
FROM SM_PATROL_RECORD record
LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
LEFT JOIN sm_patrol_task task ON task.id = record.task_id
+ LEFT JOIN sjzt_md."att_res_base" res ON task.project_id = res."guid"
LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
LEFT JOIN BLADE_USER u ON u.id = record.create_user
WHERE record.is_deleted = 0
@@ -54,6 +55,9 @@
<if test="patrolRecord.taskId !=null and patrolRecord.taskId !=''">
AND record.task_id = #{patrolRecord.taskId}
</if>
+ <if test="patrolRecord.resName != null and patrolRecord.resName !=''">
+ AND res."name" LIKE CONCAT('%',#{patrolRecord.resName},'%')
+ </if>
ORDER BY record.create_time DESC
</select>
<select id="getDetail" resultMap="selectPatrolRecordList">
--
Gitblit v1.9.3