From 027cde89bbd242f88c7d71ff602a12747b477ac5 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 07 十一月 2024 15:53:40 +0800
Subject: [PATCH] 完成教师端，考试列表展示
---
src/main/java/com/ycl/jxkg/service/ExamService.java | 2 +-
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 18 +++++++++++++++---
src/main/java/com/ycl/jxkg/controller/admin/ExamController.java | 4 ++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
index 4729816..0dae1f4 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
@@ -79,8 +79,8 @@
@GetMapping("/list")
@PreAuthorize("hasAuthority('exam:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return examService.all();
+ public Result list(ExamQuery query) {
+ return examService.all(query);
}
@GetMapping("/mark/paper/{id}")
diff --git a/src/main/java/com/ycl/jxkg/service/ExamService.java b/src/main/java/com/ycl/jxkg/service/ExamService.java
index b07b8b2..a11b97f 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamService.java
@@ -67,7 +67,7 @@
* 鍒楄〃
* @return
*/
- Result all();
+ Result all(ExamQuery query);
/**
* 涓诲姩鎻愪氦璇曞嵎
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index c65ee78..70f5f85 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -557,10 +558,21 @@
* @return
*/
@Override
- public Result all() {
- List<Exam> entities = baseMapper.selectList(null);
+ public Result all(ExamQuery query) {
+ List<Exam> entities;
+ // 鍒ゆ柇濡傛灉examName涓虹┖鎴栫┖瀛楃涓诧紝鍒欐煡璇㈡墍鏈�
+ if (query.getExamName() == null || query.getExamName().isEmpty()) {
+ entities = baseMapper.selectList(null);
+ }else {
+ entities = baseMapper.selectList(new LambdaQueryWrapper<>(Exam.class).like(Exam::getExamName,query.getExamName()));
+ }
List<ExamVO> vos = entities.stream()
- .map(entity -> ExamVO.getVoByEntity(entity, null))
+ .map(entity -> {
+ ExamVO vo = new ExamVO();
+ vo = ExamVO.getVoByEntity(entity, vo);
+ vo.setStatus(entity.getStatus().getDesc());
+ return vo;
+ })
.collect(Collectors.toList());
return Result.ok().data(vos);
}
--
Gitblit v1.8.0