From 8f20b8b0442e484220352455addc8c2e6945b153 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 六月 2024 16:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 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..1dcefdb 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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 +51,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 +103,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 +125,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());
}
/**
--
Gitblit v1.8.0