From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
index a88f9e3..8a5e704 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
@@ -1,5 +1,6 @@
 package cn.gistack.sm.sjztmd.mapper;
 
+import cn.gistack.sm.intelligentCall.entity.Scene;
 import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
 import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
 import cn.gistack.sm.sjztmd.vo.PersonVO;
@@ -50,4 +51,25 @@
 	 */
 	@DS("zt")
     Set<String> getPersonListByWaterCodeList(@Param("list") List<String> list);
+
+	/**
+	 * 根据水库编号查询市县水利部人员姓名及联系方式
+	 * @param res_cd 水库编号
+	 * @param roleAlias 角色别名
+	 * @param type 人员类型
+	 * @return
+	 */
+    List<PersonVO> getCityCountyPersonListByResGuid(@Param("adCode") String res_cd,
+														 @Param("roleAlias") String roleAlias,
+														 @Param("type") String type);
+
+	List<PatrolResponsiblePerson> getPatrolResponsiblePersonByResCdList(@Param("ids") List<String> reservoirList);
+
+	/**
+	 * 通过水库代码获取水库及巡查责任人信息
+	 * @param list
+	 * @return
+	 */
+	@DS("zt")
+	Set<Scene>  getPatrolPersonListByWaterCodeList(@Param("list") List<String> list);
 }

--
Gitblit v1.9.3