From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
index 717ed60..65e2f5a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
@@ -63,6 +63,17 @@
return R.data(null);
}
+ @Override
+ public R getYwxtAdBaseById(String guid) {
+ AttAdBase attAdBase = new AttAdBase();
+ attAdBase.setGuid(guid);
+ List<AttAdBase> attAdBases = adBaseService.getYwxtAdList(guid);
+ if (attAdBases.size() > 0)
+ return R.data(attAdBases.get(0));
+
+ return R.data(null);
+ }
+
/**
* 查询责任人相关信息
* @param guid
@@ -77,11 +88,12 @@
/**
*
* @param res_cd
+ * @param areaList
* @return
*/
@Override
- public List<PersonVO> getUserListByResGuid(String res_cd) {
- return adBaseService.getPersonListByResGuid(res_cd);
+ public List<PersonVO> getUserListByResGuid(String res_cd, String areaList) {
+ return adBaseService.getPersonListByResGuid(res_cd,areaList);
}
@Override
@@ -104,4 +116,15 @@
public Set<String> getPersonListByWaterCodeList(List<String> list) {
return attResManagePersonService.getPersonListByWaterCodeList(list);
}
+
+ /**
+ * 根据水库编号查询市县水利部人员姓名及联系方式
+ * @param res_cd 水库编号
+ * @return
+ */
+ @Override
+ @GetMapping(GET_CITY_COUNTY_PERSONG_LIST_BY_RES_GUID)
+ public List<PersonVO> getCityCountyPersonListByResGuid(String res_cd) {
+ return attResManagePersonService.getCityCountyPersonListByResGuid(res_cd);
+ }
}
--
Gitblit v1.9.3