opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 09:35:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

代码生成器的buildQueryWrapper条件格式修改

Browse Source
This commit is contained in:
LukewarmMe 2026-03-27 11:14:13 +08:00
parent 2196ef63a8
commit 4c49cbe4f1
3 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/github/yulichang/wrapper/ext/Ext.java
View File

@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.github.yulichang.wrapper.interfaces.IExt; import com.github.yulichang.wrapper.interfaces.IExt;
import org.apache.commons.lang3.ArrayUtils;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import java.util.Collection; import java.util.Collection;
@ -88,7 +87,6 @@ public interface Ext<Children extends MPJLambdaWrapper<?>> extends IExt<Children
return getChildren(); return getChildren();
} }
/** /**
* 根据给定的列名和祖先值查找集合中是否存在匹配的记录 * 根据给定的列名和祖先值查找集合中是否存在匹配的记录
* *

74
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -2,11 +2,11 @@ package ${packageName}.service.impl;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
#if($table.crud) #if($table.crud)
import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.PageResult;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
#end #end
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -40,25 +40,25 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
* @return ${functionName} * @return ${functionName}
*/ */
@Override @Override
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}) {
return baseMapper.selectVoById(${pkColumn.javaField}); return baseMapper.selectVoById(${pkColumn.javaField});
} }
#if($table.crud) #if($table.crud)
/** /**
* 分页查询${functionName}列表 * 分页查询${functionName}列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return ${functionName}分页列表 * @return ${functionName}分页列表
*/ */
@Override @Override
public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
MPJLambdaWrapper<${ClassName}> wrapper = buildQueryWrapper(bo); MPJLambdaWrapper<${ClassName}> wrapper = buildQueryWrapper(bo);
Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper); Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return PageResult.build(result.getRecords(), result.getTotal()); return PageResult.build(result.getRecords(), result.getTotal());
} }
#end #end
/** /**
* 查询符合条件的${functionName}列表 * 查询符合条件的${functionName}列表
@ -78,31 +78,31 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
#foreach($column in $columns) #foreach($column in $columns)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + $column.javaField.substring(1)) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + $column.javaField.substring(1))
#if($column.isPk==1) #if($column.isPk==1)
wrapper.orderByAsc(${ClassName}::get$AttrName); wrapper.orderByAsc(${ClassName}::get$AttrName);
#end #end
#if($column.query) #if($column.query)
#set($queryType=$column.queryType.toLowerCase()) #set($queryType=$column.queryType.toLowerCase())
#set($javaField=$column.javaField) #set($javaField=$column.javaField)
#if($queryType == 'eq') #if($queryType == 'eq')
wrapper.eqIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.eqIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'like') #elseif($queryType == 'like')
wrapper.likeIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.likeIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'likeleft') #elseif($queryType == 'likeleft')
wrapper.likeLeftIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.likeLeftIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'likeright') #elseif($queryType == 'likeright')
wrapper.likeRightIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.likeRightIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'gt') #elseif($queryType == 'gt')
wrapper.gtIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.gtIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'lt') #elseif($queryType == 'lt')
wrapper.ltIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.ltIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'ge') #elseif($queryType == 'ge')
wrapper.geIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.geIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'le') #elseif($queryType == 'le')
wrapper.leIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.leIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'in') #elseif($queryType == 'in')
wrapper.inIfExists(${ClassName}::get$AttrName, bo.get$AttrName()); wrapper.inIfExists(${ClassName}::get$AttrName, bo.get$AttrName());
#elseif($queryType == 'between') #elseif($queryType == 'between')
wrapper.betweenIfExists(${ClassName}::get$AttrName, params.get("begin$AttrName"), params.get("end$AttrName")); wrapper.betweenIfExists(${ClassName}::get$AttrName, params.get("begin$AttrName"), params.get("end$AttrName"));
#end #end
#end #end
#end #end
@ -117,10 +117,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
*/ */
@Override @Override
public Boolean insertByBo(${ClassName}Bo bo) { public Boolean insertByBo(${ClassName}Bo bo) {
${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class); ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}. class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
if (flag) { if (flag) {
bo.set$pk(add.get$pk()); bo.set$pk(add.get$pk());
} }
@ -135,7 +135,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
*/ */
@Override @Override
public Boolean updateByBo(${ClassName}Bo bo) { public Boolean updateByBo(${ClassName}Bo bo) {
${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class); ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}. class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
@ -143,7 +143,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(${ClassName} entity){ private void validEntityBeforeSave(${ClassName} entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
@ -156,7 +156,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
View File

@ -97,7 +97,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
*/ */
private MPJLambdaWrapper<SysDept> buildQueryWrapper(SysDeptBo bo) { private MPJLambdaWrapper<SysDept> buildQueryWrapper(SysDeptBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<SysDept> wrapper = new MPJLambdaWrapper<SysDept>(); MPJLambdaWrapper<SysDept> wrapper = new MPJLambdaWrapper<>();
wrapper.eqIfExists(SysDept::getDeptId, bo.getDeptId()); wrapper.eqIfExists(SysDept::getDeptId, bo.getDeptId());
wrapper.eqIfExists(SysDept::getParentId, bo.getParentId()); wrapper.eqIfExists(SysDept::getParentId, bo.getParentId());
wrapper.likeIfExists(SysDept::getDeptName, bo.getDeptName()); wrapper.likeIfExists(SysDept::getDeptName, bo.getDeptName());