From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
index eae5a55..d3ac558 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
+import cn.gistack.sm.sjztmd.vo.ChargePersonVO;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -72,6 +73,7 @@
Map<Object, Object> map = new HashMap<>();
map.put("value", userList.get(0).getId().toString());
map.put("name", userList.get(0).getName());
+ map.put("type",person.getType());
resList.add(map);
}
}
@@ -124,4 +126,29 @@
return attResManagePersonService.saveOrUpdateResManagePerson(attResManagePersons);
}
+ @ApiOperation(value="同步责任人用户", notes="同步责任人用户")
+ @GetMapping(value = "/synchronizationUser")
+ public R synchronizationUser() {
+ return R.data(attResManagePersonService.synchronizationAddUser());
+ }
+
+ /**
+ * 查询巡查、技术、主管、行政、水行政部门责任人
+ * @param resId 水库id
+ * @param findType 指定查询的责任人类型
+ * @return
+ */
+ @GetMapping("/getManagePersonList")
+ public R getManagePersonList(String resId,String findType){
+
+ List<ChargePersonVO> list = attResManagePersonService.getManagePersonList(resId,findType);
+ return R.data(list);
+
+ }
+
+ @GetMapping("/getCityCountyPersonListByResGuid")
+ public R getCityCountyPersonListByResGuid(String resCd){
+ return R.data(attResManagePersonService.getCityCountyPersonListByResGuid(resCd));
+ }
+
}
--
Gitblit v1.9.3