From 095210f9149c73e6e00d997b39fd6c44a65e4d38 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:04:17 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/AppVersionServiceImpl.java | 64 ++++++++++----------------------
1 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AppVersionServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AppVersionServiceImpl.java
index 814ee65..28b7b42 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AppVersionServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AppVersionServiceImpl.java
@@ -13,6 +13,7 @@
import com.doumee.dao.business.AppVersionMapper;
import com.doumee.dao.business.model.AppVersion;
import com.doumee.service.business.AppVersionService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,55 +109,30 @@
@Override
public PageData<AppVersion> findPage(PageWrap<AppVersion> pageWrap) {
IPage<AppVersion> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<AppVersion> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- pageWrap.getModel().setDeleted(Constants.ZERO);
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(AppVersion::getId, pageWrap.getModel().getId());
+ MPJLambdaWrapper<AppVersion> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(AppVersion.class)
+ .select("su.REALNAME as createUserName")
+ .leftJoin("system_user su on su.ID = t.CREATE_USER")
+ .eq(AppVersion::getDeleted, Constants.ZERO);
+ AppVersion model = pageWrap.getModel();
+ Utils.MP.blankToNull(model);
+ if (model.getVersionInfo() != null) {
+ wrapper.like(AppVersion::getVersionInfo, model.getVersionInfo());
}
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(AppVersion::getDeleted, pageWrap.getModel().getDeleted());
+ if (model.getName() != null) {
+ wrapper.like(AppVersion::getName, model.getName());
}
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(AppVersion::getCreateUser, pageWrap.getModel().getCreateUser());
+ if (model.getTitle() != null) {
+ wrapper.like(AppVersion::getTitle, model.getTitle());
}
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(AppVersion::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(AppVersion::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
+ if (model.getIsForce() != null) {
+ wrapper.eq(AppVersion::getIsForce, model.getIsForce());
}
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(AppVersion::getUpdateUser, pageWrap.getModel().getUpdateUser());
+ if (model.getType() != null) {
+ wrapper.eq(AppVersion::getType, model.getType());
}
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(AppVersion::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(AppVersion::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(AppVersion::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getVersionInfo() != null) {
- queryWrapper.lambda().like(AppVersion::getVersionInfo, pageWrap.getModel().getVersionInfo());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().like(AppVersion::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().like(AppVersion::getTitle, pageWrap.getModel().getTitle());
- }
- if (pageWrap.getModel().getIsForce() != null) {
- queryWrapper.lambda().eq(AppVersion::getIsForce, pageWrap.getModel().getIsForce());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(AppVersion::getType, pageWrap.getModel().getType());
- }
- for (PageWrap.SortData sortData : pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(appVersionMapper.selectPage(page, queryWrapper));
+ wrapper.orderByDesc(AppVersion::getId);
+ return PageData.from(appVersionMapper.selectJoinPage(page, AppVersion.class, wrapper));
}
@Override
--
Gitblit v1.9.3