From 9304aba1d5299f80db70f65a659807a6ffa1024d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 17:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/student/MeetController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/MeetController.java b/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
index fc55f09..b63f863 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
@@ -9,11 +9,14 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
/**
* 浼氳琛� 鍓嶇鎺у埗鍣�
@@ -30,14 +33,20 @@
private final MeetService meetService;
- @GetMapping("/page")
+ @PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(MeetQuery query) {
+ public Result page(@RequestBody MeetQuery query) {
return meetService.studentPage(query);
}
+ @GetMapping("/classes")
+ @ApiOperation(value = "鑾峰彇瀛︾敓鐨勭彮绾�", notes = "鑾峰彇瀛︾敓鐨勭彮绾�")
+ public Result getStudentClasses() {
+ return meetService.getStudentClasses();
+ }
+
@GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @ApiOperation(value = "瀛︾敓涓婅", notes = "瀛︾敓涓婅")
public Result detail(@PathVariable("id") Integer id) {
return meetService.detail(id);
}
--
Gitblit v1.8.0