diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java index f8b963341..ab396a6c5 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java @@ -178,6 +178,10 @@ public interface GenConstants { * 相等查询 */ String QUERY_EQ = "EQ"; + /** + * 范围查询 + */ + String QUERY_BETWEEN = "BETWEEN"; /** * 必填标识,对应前端表单规则中的必填字段配置。 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java index 4b89f8427..7bb7d9398 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java @@ -237,6 +237,9 @@ public class VelocityUtils { } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { importList.add("org.dromara.common.translation.annotation.Translation"); 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; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 8ff476cbe..9d1c938ba 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -25,6 +25,7 @@ public class ${ClassName}Bo implements Serializable { @Serial private static final long serialVersionUID = 1L; +#set($hasBetween = false) #foreach ($column in $columns) #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; #end +#if($column.query && $column.queryType == 'BETWEEN') +#set($hasBetween = true) +#end +#end +#if($hasBetween) + /** + * 查询参数 + */ + private Map params = new HashMap<>(); #end }