From 805c79506b16c8b0a73791d368326bd10aeac0c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 18 十二月 2020 17:46:05 +0800
Subject: [PATCH] 代码生成 后端支持 between
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 16 ++++++----------
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 5 +++++
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 03f535a..9e9dd4b 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -10,14 +10,12 @@
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 @@
* @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 $column.javaType $column.javaField;
#end
#end
+
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
}
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 6f52b70..ecb3436 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -10,6 +10,7 @@
import ${packageName}.service.I${ClassName}Service;
import java.util.List;
+import java.util.Map;
/**
* ${functionName}Service涓氬姟灞傚鐞�
@@ -101,6 +102,10 @@
}
#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
--
Gitblit v1.9.3