代码生成 后端支持 between

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -10,14 +10,12 @@ import com.ruoyi.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
 import java.math.BigDecimal;
-#if($table.crud)
-import com.ruoyi.common.core.domain.BaseEntity;
-#elseif($table.tree)
-import com.ruoyi.common.core.domain.TreeEntity;
-#end
 
 /**
  * ${functionName}对象 ${tableName}
@@ -25,11 +23,6 @@ import com.ruoyi.common.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud)
-#set($Entity="BaseEntity")
-#elseif($table.tree)
-#set($Entity="TreeEntity")
-#end
 @Data
 @ToString
 @EqualsAndHashCode
@@ -66,4 +59,7 @@ private static final long serialVersionUID=1L;
     private $column.javaType $column.javaField;
 #end
 #end
+
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 }

ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -10,6 +10,7 @@ import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ${functionName}Service业务层处理
@@ -101,6 +102,10 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         }
 #end
 #elseif($queryType == "BETWEEN")
+        Map<String, Object> params = ${className}.getParams();
+        if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
+            lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"),params.get("end$AttrName"));
+        }
 #end
 #end
 #end