支持包含查询

tangllty · Dec 23, 2023 · 6faadd1 · 6faadd1
1 parent acd2cb8
commit 6faadd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/databases/20221210.sql b/databases/20221210.sql
@@ -465,7 +465,7 @@ create table gen_table_column (
     is_insert       char(1)       default '0'              comment '是否为插入字段{0=否, 1=是}',
     is_edit         char(1)       default '0'              comment '是否编辑字段{0=否, 1=是}',
     is_required     char(1)       default '0'              comment '是否必填{0=否, 1=是}',
-    query_type      varchar(128)  default 'equal'          comment '查询方式{equal=等于, fuzzy=模糊}',
+    query_type      varchar(128)  default 'equal'          comment '查询方式{equal=等于, fuzzy=模糊, findInSet=包含}',
     html_type       varchar(128)  default ''               comment '显示类型',
     dict_type       varchar(128)  default ''               comment '字典类型',
     sort            int(4)        default 0                comment '显示顺序',

diff --git a/tang-generator/src/main/java/com/tang/generator/entity/GenTableColumn.java b/tang-generator/src/main/java/com/tang/generator/entity/GenTableColumn.java
@@ -83,7 +83,7 @@ public class GenTableColumn extends BaseEntity {
     private String isRequired;
 
     /**
-     * 查询方式{equal=等于, fuzzy=模糊}
+     * 查询方式{equal=等于, fuzzy=模糊, findInSet=包含}
      */
     private String queryType;
 

diff --git a/tang-generator/src/main/resources/vm/xml/mapper.xml.vm b/tang-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -27,6 +27,11 @@
                 and ${tableAlias}.$column.columnName like concat('%', #{$column.javaField}, '%')
             </if>
 #end
+#if($column.queryType == "in")
+            <if test="$column.javaField != null#if($column.javaType == 'String') and $column.javaField != ''#end">
+                and find_in_set(#{$column.javaField}, ${tableAlias}.$column.columnName)
+            </if>
+#end
 #end
         </where>
     </select>