From 3dc1bcd5644b80b72927365a4e8a46adae5f0e05 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 25 Jan 2024 11:03:18 +0800
Subject: [PATCH] 巡检申报增加水库字段

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java        |   12 ++++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml |    2 +-
 2 files changed, 13 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 2809043..58aaff5 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,7 +38,7 @@
         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,res."name" resName
+        u.real_name,res."name" resName,res."guid" resGuid,res."res_reg_code" resRegCode,res."res_loc" resLoc
         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
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
index 9ae2fd3..722397e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
@@ -55,7 +55,19 @@
 	private String taskName;
 
 	/**
+	 * 水库编码
+	 */
+	private String resGuid;
+	/**
 	 * 水库名称
 	 */
 	private String resName;
+	/**
+	 * 水库注册登记码
+	 */
+	private String resRegCode;
+	/**
+	 * 水库所在位置
+	 */
+	private String resLoc;
 }

--
Gitblit v1.9.3