diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java index 421b0dad..2bd00580 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java @@ -73,16 +73,21 @@ public class GroupController { @Anonymous @PostMapping("/query") - public JsonResponse> queryGroupList(@RequestBody @Validated BaseDto query){ + public JsonResponse> queryGroupList(@RequestBody @Validated BaseDto query) { if (query.getPageNum() > 0) { PageHelper.startPage(query.getPageNum(), query.getPageSize()); } return JsonResponse.ok(new PageInfo<>(ktsGroupService.queryGroupList(query.getParam()))); } + @PostMapping("/detail") + public JsonResponse detail(@RequestBody @Validated GroupDto.Detail dto) { + return JsonResponse.ok(ktsGroupService.detail(dto.getGroupId())); + } + @Anonymous @PostMapping("/childList") - public JsonResponse> childList(@RequestBody @Validated BaseDto query){ + public JsonResponse> childList(@RequestBody @Validated BaseDto query) { // if (query.getPageNum() > 0) { // PageHelper.startPage(query.getPageNum(), query.getPageSize()); // } @@ -90,24 +95,26 @@ public class GroupController { } @PostMapping("/add") - public JsonResponse add(@RequestBody @Validated GroupDto.Add dto){ + public JsonResponse add(@RequestBody @Validated GroupDto.Add dto) { ktsGroupService.add(dto); return JsonResponse.ok(); } + @PostMapping("/del") - public JsonResponse del(@RequestBody @Validated CommonDto.DelDto dto){ + public JsonResponse del(@RequestBody @Validated CommonDto.DelDto dto) { ktsGroupService.del(dto); return JsonResponse.ok(); } + @PostMapping("/status") - public JsonResponse status(@RequestBody @Validated CommonDto.StatusDto dto){ + public JsonResponse status(@RequestBody @Validated CommonDto.StatusDto dto) { ktsGroupService.status(dto); return JsonResponse.ok(); } @Anonymous @PostMapping("/member/query") - public JsonResponse> queryMemberList(@RequestBody @Validated BaseDto query){ + public JsonResponse> queryMemberList(@RequestBody @Validated BaseDto query) { if (query.getPageNum() > 0) { PageHelper.startPage(query.getPageNum(), query.getPageSize()); } @@ -123,11 +130,37 @@ public class GroupController { } @PostMapping("/member/del") - public JsonResponse delMember(@RequestBody @Validated CommonDto.DelDto dto){ + public JsonResponse delMember(@RequestBody @Validated CommonDto.DelDto dto) { ktsGroupService.delMember(dto); return JsonResponse.ok(); } + @PostMapping("/member/del") + public JsonResponse configAdd(@RequestBody @Validated GroupDto.ConfigAdd dto) { + return JsonResponse.ok(ktsGroupService.configAdd(dto)); + } + + @PostMapping("/config/add") + public JsonResponse configQuery() { + return JsonResponse.ok(ktsGroupService.configQuery()); + } + + @PostMapping("/num") + public JsonResponse> queryNum(){ + return JsonResponse.ok(ktsGroupService.queryNum()); + } + + @PostMapping("/jhzt") + public JsonResponse> jhzt(){ + return JsonResponse.ok(ktsGroupService.jhzt()); + } + + @PostMapping("/kzzt") + public JsonResponse> kzzt(){ + return JsonResponse.ok(ktsGroupService.kzzt()); + } + + private void aduit(Long memberId) throws Exception { //1.流程初始化表单 diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index 45e048a4..c72ae3c7 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -65,7 +65,7 @@ - + @@ -89,12 +89,14 @@ -
-
-
-
-
- + + + + + +
+
+