From 881f273bca0f94345efb2c0cac52279af4a7f4e4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:16:08 +0800
Subject: [PATCH] 后台管理自动化代码生成

---
 src/main/resources/generater/admin/adminController.template |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mongoDBDao.template b/src/main/resources/generater/admin/adminController.template
similarity index 88%
copy from src/main/resources/mongoDBDao.template
copy to src/main/resources/generater/admin/adminController.template
index 1ef3608..cc5ba65 100644
--- a/src/main/resources/mongoDBDao.template
+++ b/src/main/resources/generater/admin/adminController.template
@@ -47,7 +47,7 @@
 
     private Query getQuery(DaoQuery daoQuery){
           List<Criteria> andList=new ArrayList<>();
-           <#list columnDataList as value>
+           <#list daoQueryColumnDataList as value>
                <#if (value.type!"") == "Date">
                if(daoQuery.min${value.columnName?cap_first}!=null){
                     andList.add(Criteria.where("${value.columnName}").gte(daoQuery.min${value.columnName?cap_first}));
@@ -57,7 +57,11 @@
                }
                <#else>
                if(daoQuery.${value.columnName}!=null){
+                 <#if (value.queryType!"") == "equal">
                     andList.add(Criteria.where("${value.columnName}").is(daoQuery.${value.columnName}));
+                 <#else>
+                      andList.add(Criteria.where("${value.columnName}").regex(daoQuery.${value.columnName}));
+                 </#if>
                }
                </#if>
           </#list>
@@ -71,8 +75,8 @@
     }
 
   public static class DaoQuery{
-     <#if columnDataList??>
-       <#list columnDataList as value>
+     <#if daoQueryColumnDataList??>
+       <#list daoQueryColumnDataList as value>
         <#if (value.type!"") == "Date">
         public ${value.type} min${value.columnName?cap_first};
         public ${value.type} max${value.columnName?cap_first};

--
Gitblit v1.8.0