From 65c6651f36f292674ad5f3966937dd22e5968326 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 七月 2024 09:07:35 +0800
Subject: [PATCH] feat：补考保留最高分
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
index 6e85feb..503ba5c 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -8,6 +8,7 @@
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.UserDepartment;
import com.mindskip.xzs.domain.vo.BaseSelect;
+import com.mindskip.xzs.domain.vo.CascaderDataVO;
import com.mindskip.xzs.domain.vo.DepartmentVO;
import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
import com.mindskip.xzs.repository.DepartmentMapper;
@@ -30,13 +31,10 @@
@RequiredArgsConstructor
public class DepartmentController extends BaseApiController {
-
private final DepartmentService departmentService;
private final UserService userService;
private final UserDepartmentMapper userDepartmentMapper;
private final DepartmentMapper departmentMapper;
-
-
/**
* 鑾峰彇閮ㄩ棬涓嬬敤鎴峰垪琛�(涓嬫媺)
@@ -64,14 +62,14 @@
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
- public RestResponse<PageInfo<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
- PageInfo<DepartmentResponseVM> pageInfo = departmentService.gets(model);
+ public RestResponse<List<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
+ List<DepartmentResponseVM> pageInfo = departmentService.gets(model);
return RestResponse.ok(pageInfo);
}
@RequestMapping(value = "/add", method = RequestMethod.POST)
- public RestResponse add(@RequestBody @Valid String name) {
- return RestResponse.ok(departmentService.add(name));
+ public RestResponse add(@RequestBody @Valid Department model) {
+ return RestResponse.ok(departmentService.add(model));
}
@RequestMapping(value = "/update", method = RequestMethod.POST)
@@ -81,7 +79,7 @@
@RequestMapping(value = "/get/{id}", method = RequestMethod.POST)
public RestResponse update(@PathVariable Integer id) {
- return RestResponse.ok(departmentService.getById(id));
+ return RestResponse.ok(departmentService.getByIdVO(id));
}
@RequestMapping(value = "/getUserByDepartment/{id}", method = RequestMethod.POST)
@@ -152,4 +150,9 @@
return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getCurrentUser().getId() : null));
}
+ @GetMapping("/cascader")
+ public RestResponse<List<CascaderDataVO>> cascader(){
+ return RestResponse.ok(departmentService.cascader());
+ }
+
}
--
Gitblit v1.8.0