From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 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 e1345bc..bb4eda1 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
@@ -3,11 +3,13 @@
 import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
 import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
 import cn.gistack.sm.sjztmd.vo.PersonVO;
+import cn.gistack.sm.sjztmd.vo.UserPersonVO;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @ClassName AttResManagePersonMapper
@@ -19,6 +21,7 @@
 public interface AttResManagePersonMapper extends BaseMapper<AttResManagePerson> {
 
 	Integer updateResManagePersonByGuid(@Param("attResManagePerson")AttResManagePerson attResManagePerson);
+
 	Integer insertResManagePersion(@Param("attResManagePerson")AttResManagePerson attResManagePerson);
 
 	List<AttResManagePerson> attResManagePersonListByResId(List<Long> resId);
@@ -33,4 +36,29 @@
 	 */
 	@DS("zt")
 	List<PersonVO> getPersonListByResGuid(@Param("res_cd")String res_cd, @Param("list") List<String> personList);
+
+	List<UserPersonVO> getPersonByUserNotExists();
+
+	List<UserPersonVO> getPersonByUser();
+
+	int updateUserByPerson();
+
+	/**
+	 * 通过水库代码获取巡查责任人及技术责任人手机号
+	 * @param list
+	 * @return
+	 */
+	@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);
 }

--
Gitblit v1.9.3