From 0fb6563de530e5278356f7557480764cb59942c5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 25 六月 2024 15:14:42 +0800
Subject: [PATCH] 会议后台+学生端对接
---
src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java | 6 ++++--
src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java | 3 +++
src/main/resources/mapper/MeetMapper.xml | 15 +++++++++++----
src/main/java/com/ycl/jxkg/domain/form/MeetForm.java | 1 -
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 27 +++++++++------------------
src/main/java/com/ycl/jxkg/domain/entity/Meet.java | 5 ++---
6 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Meet.java b/src/main/java/com/ycl/jxkg/domain/entity/Meet.java
index bde6ee1..04cdced 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Meet.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Meet.java
@@ -27,8 +27,8 @@
/** 浼氳灏侀潰 */
private String meetCover;
- @TableField("classed_id")
- /** 瀛︾敓id */
+ @TableField("classes_id")
+ /** 鐝骇id */
private Integer classesId;
@TableField("create_user")
@@ -46,6 +46,5 @@
@TableField("status")
/** 鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉� */
private Integer status;
-
}
diff --git a/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java b/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
index ff451ce..b990c79 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
@@ -51,7 +51,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
- @NotNull(message = "鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉熶笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉�")
private Integer status;
diff --git a/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java b/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java
index 53ebb51..b197413 100644
--- a/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java
+++ b/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java
@@ -20,5 +20,8 @@
public class MeetQuery extends AbsQuery {
private List<Integer> classesIds;
private Integer teacherId;
+
+ private String meetName;
+ private Integer status;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java b/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
index 657f4d6..3b9cdf7 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
@@ -27,12 +27,13 @@
/** 浼氳灏侀潰 */
private String meetCover;
- /** 瀛︾敓id */
+ /** 鐝骇id */
private Integer classesId;
/** 鍒涘缓浜� */
private Integer createUser;
-
+ /** 鑰佸笀濮撳悕 */
+ private String teacherName;
/** 寮�濮嬫椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@@ -44,6 +45,7 @@
/** 鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉� */
private Integer status;
+
public static MeetVO getVoByEntity(@NonNull Meet entity, MeetVO vo) {
if(vo == null) {
vo = new MeetVO();
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());
}
/**
diff --git a/src/main/resources/mapper/MeetMapper.xml b/src/main/resources/mapper/MeetMapper.xml
index aeef8be..44fbee2 100644
--- a/src/main/resources/mapper/MeetMapper.xml
+++ b/src/main/resources/mapper/MeetMapper.xml
@@ -31,20 +31,21 @@
</select>
- <select id="getPage" resultMap="BaseResultMap">
+ <select id="getPage" resultType="com.ycl.jxkg.domain.vo.MeetVO">
SELECT
TM.meet_name,
TM.meet_cover,
TM.classes_id,
TM.create_user,
+ TU.user_name as teacherName,
TM.start_time,
TM.end_time,
TM.status,
TM.id
FROM
- t_meet TM
+ t_meet TM left join t_user TU on TM.create_user = TU.id
<where>
- TM.deleted = 0 and TC.deleted = 0
+ TM.deleted = 0
<if test="query.classesIds !=null">
and classes_id in
<foreach collection="query.classesIds" item="classesId" open="(" close=")" separator=",">
@@ -52,7 +53,13 @@
</foreach>
</if>
<if test="query.teacherId!=null">
- and create_user = #{query.teacherId}
+ and TM.create_user = #{query.teacherId}
+ </if>
+ <if test="query.status!=null">
+ and TM.status = #{query.status}
+ </if>
+ <if test="query.meetName !=null and query.meetName!='' ">
+ and TM.meet_name like concat ('%',#{query.meetName},'%')
</if>
</where>
</select>
--
Gitblit v1.8.0