From 052e1d5c47c4e536fde79074d53b0481c7d4f9b6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十月 2021 18:33:42 +0800
Subject: [PATCH] 自动化代码生成优化

---
 src/main/java/org/yeshi/utils/generater/vo/dao/MongoDBDaoVO.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/yeshi/utils/generater/vo/dao/MongoDBDaoVO.java b/src/main/java/org/yeshi/utils/generater/vo/dao/MongoDBDaoVO.java
index d214ea5..9bc53a3 100644
--- a/src/main/java/org/yeshi/utils/generater/vo/dao/MongoDBDaoVO.java
+++ b/src/main/java/org/yeshi/utils/generater/vo/dao/MongoDBDaoVO.java
@@ -2,11 +2,9 @@
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Transient;
+import org.yeshi.utils.StringUtil;
 import org.yeshi.utils.generater.annotation.admin.DaoQueryCondition;
-import org.yeshi.utils.generater.entity.BaseData;
-import org.yeshi.utils.generater.entity.ClassInfo;
-import org.yeshi.utils.generater.entity.ColumnData;
-import org.yeshi.utils.generater.entity.DaoQueryColumnData;
+import org.yeshi.utils.generater.entity.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -99,7 +97,13 @@
                 //鑾峰彇鏌ヨ鏉′欢
                 for (Annotation a : as) {
                     if (a instanceof DaoQueryCondition) {
-                        daoQueryColumnList.add(new DaoQueryColumnData(columName, columnDataType, ((DaoQueryCondition) a).queryType()));
+                        MybatisColumnData columnData=new MybatisColumnData(columName);
+                        if (fd.getType().getSimpleName().equalsIgnoreCase("Date")) {
+                            daoQueryColumnList.add(new DaoQueryColumnData("max" + StringUtil.firstCharToUpper(columName),columnData, fd.getType().getSimpleName(),  DaoQueryCondition.QueryType.lt));
+                            daoQueryColumnList.add(new DaoQueryColumnData("min" + StringUtil.firstCharToUpper(columName),columnData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.gte));
+                        } else {
+                            daoQueryColumnList.add(new DaoQueryColumnData(columName,columnData, fd.getType().getSimpleName(), ((DaoQueryCondition) a).queryType()));
+                        }
                         break;
                     }
                 }

--
Gitblit v1.8.0