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/sg/controller/SgProjectPersonConfigController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectPersonConfigController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectPersonConfigController.java
index 1cee873..253c808 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectPersonConfigController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectPersonConfigController.java
@@ -2,6 +2,8 @@
import cn.gistack.sm.sg.DO.SgProjectInfoDO;
import cn.gistack.sm.sg.DO.SgProjectPersonConfigDO;
+import cn.gistack.sm.sg.DO.SgProjectRolePersonV0;
+import cn.gistack.sm.sg.DTO.AddSgProjectPersonConfigDTO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.service.SgProjectPersonConfigService;
import org.checkerframework.checker.units.qual.A;
@@ -10,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -39,9 +42,9 @@
/**
* 新增项目人员配置
*/
- @GetMapping(value = "/add")
- public R add( @RequestBody List<SgProjectPersonConfigDO> list) {
- projectPersonConfigService.add(list);
+ @PostMapping(value = "/add")
+ public R add(@RequestBody AddSgProjectPersonConfigDTO dto) {
+ projectPersonConfigService.add(dto);
return R.success("新增成功");
}
@@ -55,12 +58,20 @@
}
/**
- * 删除
+ * 列表
*/
@GetMapping(value = "/list")
- public R delete( ProjectSearchDTO searchDTO) {
- projectPersonConfigService.getList(searchDTO);
- return R.success("删除成功");
+ public R list( ProjectSearchDTO searchDTO) {
+ List<SgProjectRolePersonV0> list = projectPersonConfigService.getList(searchDTO);
+ return R.data(list);
}
+ /**
+ * 根据角色查用户
+ */
+ @GetMapping(value = "/get_user_by_role")
+ public R getUserByRole( @RequestParam String roleId) {
+ List<Map<String,Object>> list = projectPersonConfigService.getUserByRole(roleId);
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3