From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 9b5c7c6..19f4bf3 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
@@ -1,11 +1,10 @@
package cn.gistack.sm.sjztmd.controller;
-import cn.gistack.sm.patrol.entity.PatrolConfig;
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.alibaba.nacos.client.utils.TenantUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -74,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);
}
}
@@ -96,7 +96,7 @@
@ApiOperation(value = "根据手机号码获取中台责任人水库id组合字符串", notes = "根据手机号码获取中台责任人水库id组合字符串")
@GetMapping(value = "/queryListByPhone")
public R queryListByPhone(AttResManagePerson attResManagePerson) {
- List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
+ final List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
List<String> reslist = new ArrayList<>();
list.forEach(item -> {
reslist.add(item.getResGuid());
@@ -104,7 +104,7 @@
return R.data(StringUtil.join(reslist, ","));
}
- @ApiOperation(value="巡查责任人-添加/修改", notes="巡查责任人-添加/修改")
+ @ApiOperation(value="责任人-添加/修改", notes="责任人-添加/修改")
@PostMapping(value = "/editZrr")
public R editZrr(@RequestBody AttResManagePerson attResManagePerson) {
if (StringUtil.isEmpty(attResManagePerson.getResGuid()))
@@ -120,4 +120,30 @@
return R.data(attResManagePersonService.saveOrUpdateResManagePerson(attResManagePerson));
}
+ @ApiOperation(value="多个责任人-添加/修改", notes="多个责任人-添加/修改")
+ @PostMapping(value = "/editListZrr")
+ public R editListZrr(@RequestBody List<AttResManagePerson> attResManagePersons) {
+ 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);
+
+ }
+
}
--
Gitblit v1.9.3