public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-04-02 00:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 代码生成查询选择between时生成params

Browse Source
This commit is contained in:
lau
2026-03-17 22:40:44 +08:00
parent eb68d06c79
commit fd4071e257
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
View File

@@ -178,6 +178,10 @@ public interface GenConstants {
* 相等查询 * 相等查询
*/ */
String QUERY_EQ = "EQ"; String QUERY_EQ = "EQ";
/**
* 范围查询
*/
String QUERY_BETWEEN = "BETWEEN";
/** /**
* 必填标识，对应前端表单规则中的必填字段配置。 * 必填标识，对应前端表单规则中的必填字段配置。

3
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
View File

@@ -237,6 +237,9 @@ public class VelocityUtils {
} else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) {
importList.add("org.dromara.common.translation.annotation.Translation"); importList.add("org.dromara.common.translation.annotation.Translation");
importList.add("org.dromara.common.translation.constant.TransConstant"); importList.add("org.dromara.common.translation.constant.TransConstant");
} else if (!column.isSuperColumn() && GenConstants.QUERY_BETWEEN.equals(column.getQueryType())) {
importList.add("java.util.HashMap");
importList.add("java.util.Map");
} }
} }
return importList; return importList;

10
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
View File

@@ -25,6 +25,7 @@ public class ${ClassName}Bo implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#set($hasBetween = false)
#foreach ($column in $columns) #foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) #if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
/** /**
@@ -47,6 +48,15 @@ public class ${ClassName}Bo implements Serializable {
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end #end
#if($column.query && $column.queryType == 'BETWEEN')
#set($hasBetween = true)
#end
#end
#if($hasBetween)
/**
* 查询参数
*/
private Map<String, Object> params = new HashMap<>();
#end #end
} }