From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
index f7caea6..2f06ffd 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
@@ -1,9 +1,11 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.Classes;
-import com.ycl.jxkg.domain.enums.general.ClassesStatusEnum;
+import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import com.ycl.jxkg.mapper.ClassesMapper;
import com.ycl.jxkg.service.ClassesService;
import com.ycl.jxkg.base.Result;
@@ -31,6 +33,7 @@
public class ClassesServiceImpl extends ServiceImpl<ClassesMapper, Classes> implements ClassesService {
private final ClassesMapper classesMapper;
+ private final WebContext webContext;
/**
* 娣诲姞
@@ -40,6 +43,8 @@
@Override
public Result add(ClassesForm form) {
Classes entity = ClassesForm.getEntityByForm(form, null);
+ entity.setStatus(ClassesStatusEnum.NORMAL);
+ entity.setCreateUser(webContext.getCurrentUser().getId());
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -90,6 +95,7 @@
@Override
public Result page(ClassesQuery query) {
IPage<ClassesVO> page = PageUtil.getPage(query, ClassesVO.class);
+ query.setUserId(webContext.getCurrentUser().getId());
baseMapper.getPage(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -127,4 +133,24 @@
.update();
return Result.ok("瑙ｆ暎鎴愬姛");
}
+
+
+ @Override
+ public Result myClassList() {
+ Integer userId = webContext.getCurrentUser().getId();
+ List<Classes> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(Classes::getId, Classes::getClassName)
+ .eq(Classes::getCreateUser, userId)
+ .list();
+ return Result.ok(list);
+ }
+
+ @Override
+ public Result recover(Integer id) {
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .eq(Classes::getId, id)
+ .set(Classes::getStatus, ClassesStatusEnum.NORMAL)
+ .update();
+ return Result.ok("鐝骇宸茬粡鎭㈠姝ｅ父");
+ }
}
--
Gitblit v1.8.0