From b911167866ad611a7f266d846bb15c21ae7540f4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
index 63a67fb..8c0911b 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
@@ -1,36 +1,24 @@
package com.ycl.jxkg.service.impl;
-import com.ycl.jxkg.domain.Subject;
-import com.ycl.jxkg.mapper.SubjectMapper;
-import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ycl.jxkg.domain.entity.Subject;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO;
+import com.ycl.jxkg.mapper.SubjectMapper;
+import com.ycl.jxkg.service.SubjectService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
-public class SubjectServiceImpl extends BaseServiceImpl<Subject> implements SubjectService {
+@RequiredArgsConstructor
+public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> implements SubjectService {
private final SubjectMapper subjectMapper;
-
- @Autowired
- public SubjectServiceImpl(SubjectMapper subjectMapper) {
- super(subjectMapper);
- this.subjectMapper = subjectMapper;
- }
-
- @Override
- public Subject selectById(Integer id) {
- return super.selectById(id);
- }
-
- @Override
- public int updateByIdFilter(Subject record) {
- return super.updateByIdFilter(record);
- }
@Override
public List<Subject> getSubjectByLevel(Integer level) {
@@ -43,15 +31,23 @@
}
@Override
- public Integer levelBySubjectId(Integer id) {
- return this.selectById(id).getLevel();
+ public PageInfo<SubjectResponseVO> page(SubjectPageRequestVO requestVM) {
+ return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "item_order").doSelectPageInfo(() ->
+ subjectMapper.page(requestVM)
+ );
}
@Override
- public PageInfo<Subject> page(SubjectPageRequestVO requestVM) {
- return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
- subjectMapper.page(requestVM)
- );
+ public Integer getItemOrder() {
+ return subjectMapper.getItemOrder();
+ }
+
+ @Override
+ public Boolean updateStatus(Subject subject) {
+ return new LambdaUpdateChainWrapper<>(subjectMapper)
+ .set(Subject::getStatus, subject.getStatus())
+ .eq(Subject::getId, subject.getId())
+ .update();
}
}
--
Gitblit v1.8.0