From eda55530e64d87f6c642ce4596dc288a49f258cc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 七月 2024 18:39:12 +0800
Subject: [PATCH] 学生考试分页增加提交状态，登录学生信息返回
---
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
index 50ba3f3..77687d9 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -2,8 +2,10 @@
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.Meet;
+import com.ycl.jxkg.enums.MeetStatusEnum;
import com.ycl.jxkg.mapper.ClassesUserMapper;
import com.ycl.jxkg.mapper.MeetMapper;
import com.ycl.jxkg.service.MeetService;
@@ -50,6 +52,7 @@
@Override
public Result add(MeetForm form) {
Meet entity = MeetForm.getEntityByForm(form, null);
+ entity.setStatus(MeetStatusEnum.Wait.getCode());
entity.setCreateUser(webContext.getCurrentUser().getId());
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
@@ -101,17 +104,12 @@
@Override
public Result page(MeetQuery query) {
Integer id = webContext.getCurrentUser().getId();
+ //鏌ヨ嚜宸卞垱寤虹殑鎴块棿
query.setTeacherId(id);
- IPage<Meet> page = PageUtil.getPage(query, Meet.class);
+ IPage<MeetVO> page = PageUtil.getPage(query, MeetVO.class);
baseMapper.getPage(page, query);
- List<Meet> records = page.getRecords();
- List<MeetVO> vos = new ArrayList<>();
- for (Meet record : records) {
- MeetVO meetVO = new MeetVO();
- BeanUtils.copyProperties(record,meetVO);
- vos.add(meetVO);
- }
- return Result.ok().data(vos).total(page.getTotal());
+
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
}
/**
@@ -128,16 +126,10 @@
return Result.ok("鎮ㄦ殏鏈姞鍏ョ彮绾�");
}
query.setClassesIds(classes);
- IPage<Meet> page = PageUtil.getPage(query, Meet.class);
+ IPage<MeetVO> page = PageUtil.getPage(query, MeetVO.class);
baseMapper.getPage(page, query);
- List<Meet> records = page.getRecords();
- List<MeetVO> vos = new ArrayList<>();
- for (Meet record : records) {
- MeetVO meetVO = new MeetVO();
- BeanUtils.copyProperties(record,meetVO);
- vos.add(meetVO);
- }
- return Result.ok().data(vos).total(page.getTotal());
+
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
}
/**
@@ -149,7 +141,11 @@
public Result detail(Integer id) {
MeetVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
- return Result.ok().data(vo);
+ if(vo.getStatus().equals(MeetStatusEnum.Starting.getCode())){
+ return Result.ok();
+ }else {
+ return Result.fail(SystemCode.InnerError.getCode(),"鎴块棿灏氭湭寮�濮嬫垨宸茬粨鏉�");
+ }
}
/**
--
Gitblit v1.8.0