From f8a4a4306824bf9874a4333e12a0307555ffbb08 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 14:41:42 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 478f86a..13c59df 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -1,15 +1,20 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CategoryMapper;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CategoryService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -87,57 +92,55 @@
@Override
public PageData<Category> findPage(PageWrap<Category> pageWrap) {
IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Category> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Category> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setDeleted(Constants.ZERO);
+ queryWrapper.selectAll(Category.class)
+ .selectAs(SystemUser::getUsername, Category::getUpdateUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Category::getUpdateUser);
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Category::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(Category::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(Category::getDeleted, pageWrap.getModel().getDeleted());
+ queryWrapper.eq(Category::getDeleted, pageWrap.getModel().getDeleted());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Category::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(Category::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(Category::getCreateUser, pageWrap.getModel().getCreateUser());
+ queryWrapper.eq(Category::getCreateUser, pageWrap.getModel().getCreateUser());
}
if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(Category::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(Category::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
+ queryWrapper.ge(Category::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
+ queryWrapper.le(Category::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
}
if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(Category::getUpdateUser, pageWrap.getModel().getUpdateUser());
+ queryWrapper.eq(Category::getUpdateUser, pageWrap.getModel().getUpdateUser());
}
if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(Category::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(Category::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
+ queryWrapper.ge(Category::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
+ queryWrapper.le(Category::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Category::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(Category::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Category::getName, pageWrap.getModel().getName());
+ queryWrapper.like(Category::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Category::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(Category::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getDetail() != null) {
- queryWrapper.lambda().eq(Category::getDetail, pageWrap.getModel().getDetail());
+ queryWrapper.eq(Category::getDetail, pageWrap.getModel().getDetail());
}
if (pageWrap.getModel().getIcon() != null) {
- queryWrapper.lambda().eq(Category::getIcon, pageWrap.getModel().getIcon());
+ queryWrapper.eq(Category::getIcon, pageWrap.getModel().getIcon());
}
if (pageWrap.getModel().getIsFixed() != null) {
- queryWrapper.lambda().eq(Category::getIsFixed, pageWrap.getModel().getIsFixed());
+ queryWrapper.eq(Category::getIsFixed, pageWrap.getModel().getIsFixed());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(categoryMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByAsc(Category::getSortnum);
+ return PageData.from(categoryMapper.selectJoinPage(page, Category.class,queryWrapper));
}
@Override
--
Gitblit v1.9.3