代码生成调整

generator/src/main/java/com/ximai/generator/domain/GenTable.java

@@ -45,7 +45,6 @@ public class GenTable extends BaseEntity
     private String packageName;
 
     /** 生成包路径 */
-    @NotBlank(message = "子包名称")
     private String childPackageName;
 
     /** 生成模块名 */

generator/src/main/java/com/ximai/generator/util/VelocityUtils.java

@@ -133,6 +133,7 @@ public class VelocityUtils
     {
         List<String> templates = new ArrayList<String>();
         templates.add("vm/java/domain.java.vm");
+        templates.add("vm/java/dto.java.vm");
         templates.add("vm/java/dto-query.java.vm");
         templates.add("vm/java/dto-create.java.vm");
         templates.add("vm/java/dto-update.java.vm");
@@ -181,6 +182,8 @@ public class VelocityUtils
         String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
         if(StringUtils.isNotEmpty(childPackageName)){
             childPackageName =  childPackageName+"/";
+        }else{
+            childPackageName = "";
         }
         String mybatisPath = MYBATIS_PATH + "/" + moduleName;
         String vuePath = "vue";
@@ -189,10 +192,14 @@ public class VelocityUtils
         {
             fileName = StringUtils.format("{}/domain/{}{}.java", javaPath, childPackageName, className);
         }
-        if (template.contains("dto-query.java.vm"))
+        if (template.contains("dto.java.vm"))
         {
             fileName = StringUtils.format("{}/dto/{}{}Dto.java", javaPath, childPackageName, className);
         }
+        if (template.contains("dto-query.java.vm"))
+        {
+            fileName = StringUtils.format("{}/dto/{}{}Query.java", javaPath, childPackageName, className);
+        }
         if (template.contains("dto-create.java.vm"))
         {
             fileName = StringUtils.format("{}/dto/{}{}Create.java", javaPath, childPackageName, className);

generator/src/main/resources/vm/java/controller.java.vm

@@ -2,6 +2,8 @@ package ${packageName}.controller${childPackageName};
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +21,7 @@ import com.ximai.common.enums.BusinessType;
 import io.swagger.annotations.ApiOperation;
 import ${packageName}.domain${childPackageName}.${ClassName};
 import ${packageName}.dto${childPackageName}.${ClassName}Dto;
+import ${packageName}.dto${childPackageName}.${ClassName}Query;
 import ${packageName}.dto${childPackageName}.${ClassName}Create;
 import ${packageName}.dto${childPackageName}.${ClassName}Update;
 import ${packageName}.dto${childPackageName}.${ClassName}ExcelExport;
@@ -50,15 +53,38 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
-    public TableDataInfo<${ClassName}Dto> list(${ClassName} ${className})
-    {
+    public TableDataInfo<${ClassName}Dto> list(${ClassName}Query ${className}Query) {
         startPage();
-        List<${ClassName}Dto> list = ${className}Service.select${ClassName}List(${className});
+        QueryWrapper<${ClassName}> query = new QueryWrapper<>();
+#foreach($column in $columns)
+#set($queryType=$column.queryType)
+#set($javaField=$column.javaField)
+#set($javaType=$column.javaType)
+#set($columnName=$column.columnName)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if($column.query)
+#if($column.queryType == "EQ")
+        query.eq(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", ${className}Query.get${AttrName}());
+#elseif($column.queryType == "NE")
+        query.ne(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", ${className}Query.get${AttrName}());
+#elseif($column.queryType == "GT")
+        query.gt(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", ${className}Query.get${AttrName}());
+#elseif($column.queryType == "GTE")
+        query.ge(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", ${className}Query.get${AttrName}());
+#elseif($column.queryType == "LT")
+        query.lt(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", ${className}Query.get${AttrName}());
+#elseif($column.queryType == "LTE")
+        query.le(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", ${className}Query.get${AttrName}());
+#elseif($column.queryType == "LIKE")
+        query.like(#if($javaType == 'String')StringUtils.isNotEmpty(${className}Query.get${AttrName}())#else${className}Query.get${AttrName}()!=null#end, "m.$columnName", "%" + ${className}Query.get${AttrName}() + "%");
+#end
+#end
+#end
+        List<${ClassName}Dto> list = ${className}Service.select${ClassName}DtoList(query);
         return getDataTable(list);
     }
 #elseif($table.tree)
-    public AjaxResult<${ClassName}Dto> list(${ClassName} ${className})
-    {
+    public AjaxResult<${ClassName}Dto> list(${ClassName} ${className}) {
         List<${ClassName}Dto> list = ${className}Service.select${ClassName}List(${className});
         return AjaxResult.success(list);
     }
@@ -71,8 +97,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
-    {
+    public void export(HttpServletResponse response, ${ClassName} ${className}) {
         List<${ClassName}Dto> list = ${className}Service.select${ClassName}List(${className});
         ExcelUtil<${ClassName}ExcelExport> util = new ExcelUtil<${ClassName}ExcelExport>(${ClassName}ExcelExport.class);
         List<${ClassName}ExcelExport> tempList = BeanUtil.copyToList(list, ${ClassName}ExcelExport.class);
@@ -85,8 +110,7 @@ public class ${ClassName}Controller extends BaseController
     @ApiOperation("获取${functionName}详细信息")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
     @GetMapping(value = "/{${pkColumn.javaField}}")
-    public AjaxResult<${ClassName}Dto> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public AjaxResult<${ClassName}Dto> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return AjaxResult.success(${className}Service.select${ClassName}DtoBy${pkColumn.capJavaField}(${pkColumn.javaField}));
     }
 
@@ -97,8 +121,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ${ClassName}Create ${className}Create)
-    {
+    public AjaxResult add(@RequestBody ${ClassName}Create ${className}Create) {
         return toAjax(${className}Service.insert${ClassName}(${className}Create));
     }
 
@@ -109,8 +132,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ${ClassName}Update ${className}Update)
-    {
+    public AjaxResult edit(@RequestBody ${ClassName}Update ${className}Update) {
         return toAjax(${className}Service.update${ClassName}(${className}Update));
     }
 
@@ -121,8 +143,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
     }
 }

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

@@ -38,12 +38,12 @@ public class ${ClassName} extends ${Entity} {
 #set($comment=$column.columnComment)
 #end
 #if($parentheseIndex != -1)
-    @ApiModelProperty(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(name = "${comment}")
 #else
-    @ApiModelProperty(name = "${comment}")
+    @ApiModelProperty("${comment}")
 #end
 #end
 #if($column.javaField == $pkColumn.javaField)

generator/src/main/resources/vm/java/dto-create.java.vm

@@ -28,12 +28,12 @@ public class ${ClassName}Create {
 #set($comment=$column.columnComment)
 #end
 #if($parentheseIndex != -1)
-    @ApiModelProperty(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "${comment}")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("${comment}")
 #else
-    @ApiModelProperty(name = "${comment}")
+    @ApiModelProperty("${comment}")
 #end
 #end
 #if($column.javaField == $pkColumn.javaField)

generator/src/main/resources/vm/java/dto-excelExport.java.vm

@@ -34,14 +34,14 @@ public class ${ClassName}ExcelExport {
 #set($comment=$column.columnComment)
 #end
 #if($parentheseIndex != -1)
-    @ApiModelProperty(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "${comment}")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("${comment}")
     @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
-    @ApiModelProperty(name = "${comment}")
+    @ApiModelProperty("${comment}")
     @Excel(name = "${comment}")
 #end
 #end

generator/src/main/resources/vm/java/dto-excelImport.java.vm

@@ -34,14 +34,14 @@ public class ${ClassName}ExcelImport {
 #set($comment=$column.columnComment)
 #end
 #if($parentheseIndex != -1)
-    @ApiModelProperty(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "${comment}")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("${comment}")
     @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
-    @ApiModelProperty(name = "${comment}")
+    @ApiModelProperty("${comment}")
     @Excel(name = "${comment}")
 #end
 #end

generator/src/main/resources/vm/java/dto-query.java.vm

@@ -6,6 +6,8 @@ import ${import};
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * ${functionName}对象 ${tableName}
@@ -14,34 +16,22 @@ import lombok.Data;
  * @date ${datetime}
  */
 @Data
-public class ${ClassName}Dto {
+public class ${ClassName}Query {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
     /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#if($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("$column.columnComment")
 #else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
-    @ApiModelProperty(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "${comment}")
-#else
-    @ApiModelProperty(name = "${comment}")
-#end
+    @ApiModelProperty("$column.columnComment")
 #end
 #if($column.javaField == $pkColumn.javaField)
     @TableId
 #end
     private $column.javaType $column.javaField;
 
-#end
 #end
 #if($table.sub)
     /** $table.subTable.functionName信息 */

generator/src/main/resources/vm/java/dto-update.java.vm

@@ -28,12 +28,12 @@ public class ${ClassName}Update {
 #set($comment=$column.columnComment)
 #end
 #if($parentheseIndex != -1)
-    @ApiModelProperty(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "${comment}")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("${comment}")
 #else
-    @ApiModelProperty(name = "${comment}")
+    @ApiModelProperty("${comment}")
 #end
 #end
 #if($column.javaField == $pkColumn.javaField)

generator/src/main/resources/vm/java/dto.java.vm

+package ${packageName}.dto${childPackageName};
+
+#foreach ($import in $importList)
+import ${import};
+#end
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Data
+public class ${ClassName}Dto {
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $columns)
+    /** $column.columnComment */
+#if($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("$column.columnComment")
+#else
+    @ApiModelProperty("$column.columnComment")
+#end
+#if($column.javaField == $pkColumn.javaField)
+    @TableId
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#if($table.sub)
+    /** $table.subTable.functionName信息 */
+    private List<${subClassName}> ${subclassName}List;
+
+#end
+
+
+}

generator/src/main/resources/vm/java/mapper.java.vm

@@ -4,6 +4,9 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain${childPackageName}.${ClassName};
 import ${packageName}.dto${childPackageName}.${ClassName}Dto;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 #if($table.sub)
 import ${packageName}.domain${childPackageName}.${subClassName};
 #end
@@ -32,6 +35,15 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      */
     public List<${ClassName}Dto> select${ClassName}List(${ClassName} ${className});
 
+    /**
+     * 查询${functionName}列表
+     *
+     * @param ${className}Query ${functionName}
+     * @return ${functionName}集合
+     */
+    @Select("select m.* from ${tableName} m ${ew.customSqlSegment}")
+    public List<${ClassName}Dto> selectDtoListByQw(@Param("ew") QueryWrapper<${ClassName}> ${className}Query);
+
     /**
      * 新增${functionName}
      *

generator/src/main/resources/vm/java/service.java.vm

@@ -47,6 +47,14 @@ public interface I${ClassName}Service
      */
     public List<${ClassName}> select${ClassName}List(QueryWrapper<${ClassName}> ${className}Query);
 
+    /**
+     * 查询${functionName}列表
+     *
+     * @param ${className}Query ${functionName}
+     * @return ${functionName}集合
+     */
+    public List<${ClassName}Dto> select${ClassName}DtoList(QueryWrapper<${ClassName}> ${className}Query);
+
     /**
      * 新增${functionName}
      * 

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

@@ -44,8 +44,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public ${ClassName}Dto select${ClassName}DtoBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public ${ClassName}Dto select${ClassName}DtoBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
 
@@ -56,8 +55,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.selectById(${pkColumn.javaField});
     }
 
@@ -68,8 +66,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}Dto> select${ClassName}List(${ClassName} ${className})
-    {
+    public List<${ClassName}Dto> select${ClassName}List(${ClassName} ${className}) {
         return ${className}Mapper.select${ClassName}List(${className});
     }
 
@@ -80,11 +77,21 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(QueryWrapper<${ClassName}> ${className}Query)
-    {
+    public List<${ClassName}> select${ClassName}List(QueryWrapper<${ClassName}> ${className}Query) {
         return ${className}Mapper.selectList(${className}Query);
     }
 
+    /**
+     * 查询${functionName}列表
+     *
+     * @param ${className}Query ${functionName}
+     * @return ${functionName}
+     */
+    @Override
+    public List<${ClassName}Dto> select${ClassName}DtoList(QueryWrapper<${ClassName}> ${className}Query) {
+        return ${className}Mapper.selectDtoListByQw(${className}Query);
+    }
+
     /**
      * 新增${functionName}
      *
@@ -95,8 +102,15 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int insert${ClassName}(${ClassName}Create ${className}Create)
-    {
+    public int insert${ClassName}(${ClassName}Create ${className}Create) {
+
+#if($table.sub)
+        int rows = ${className}Mapper.insert${ClassName}(${className});
+        insert${subClassName}(${className});
+        return rows;
+#else
+        ${ClassName} ${className} = new ${ClassName}();
+        BeanUtil.copyProperties(${className}Create, ${className});
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());
@@ -105,13 +119,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
         ${className}.setCreateBy(SecurityUtils.getUsername());
 #end
 #end
-#if($table.sub)
-        int rows = ${className}Mapper.insert${ClassName}(${className});
-        insert${subClassName}(${className});
-        return rows;
-#else
-        ${ClassName} ${className} = new ${ClassName}();
-        BeanUtil.copyProperties(${className}Create, ${className});
         return ${className}Mapper.insert${ClassName}(${className});
 #end
     }
@@ -126,8 +133,13 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int update${ClassName}(${ClassName}Update ${className}Update)
-    {
+    public int update${ClassName}(${ClassName}Update ${className}Update) {
+#if($table.sub)
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        insert${subClassName}(${className});
+#end
+        ${ClassName} ${className} = new ${ClassName}();
+        BeanUtil.copyProperties(${className}Update, ${className});
 #foreach ($column in $columns)
 #if($column.javaField == 'updateTime')
         ${className}.setUpdateTime(DateUtils.getNowDate());
@@ -136,12 +148,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
         ${className}.setUpdateBy(SecurityUtils.getUsername());
 #end
 #end
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
-        insert${subClassName}(${className});
-#end
-        ${ClassName} ${className} = new ${ClassName}();
-        BeanUtil.copyProperties(${className}Update, ${className});
         return ${className}Mapper.update${ClassName}(${className});
     }
 
@@ -155,8 +161,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
@@ -173,8 +178,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
 #end
@@ -187,8 +191,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      *
      * @param ${className} ${functionName}对象
      */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
+    public void insert${subClassName}(${ClassName} ${className}) {
         List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
         ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
         if (StringUtils.isNotNull(${subclassName}List))

generator/src/test/java/com/ximai/generator/BuildUtil.java

@@ -36,6 +36,7 @@ public class BuildUtil {
             setIsEdit("1");
             setIsList("1");
             setIsQuery("1");
+            setQueryType("EQ");
             setSort(2);
         }});
         columns.add(new GenTableColumn(){{
@@ -49,6 +50,7 @@ public class BuildUtil {
             setIsEdit("1");
             setIsList("1");
             setIsQuery("1");
+            setQueryType("EQ");
             setSort(3);
         }});
         columns.add(new GenTableColumn(){{
@@ -61,7 +63,8 @@ public class BuildUtil {
             setIsInsert("1");
             setIsEdit("0");
             setIsList("0");
-            setIsQuery("0");
+            setIsQuery("1");
+            setQueryType("NE");
             setSort(4);
         }});
         columns.add(new GenTableColumn(){{
@@ -74,7 +77,8 @@ public class BuildUtil {
             setIsInsert("1");
             setIsEdit("1");
             setIsList("1");
-            setIsQuery("0");
+            setIsQuery("1");
+            setQueryType("GTE");
             setSort(5);
         }});
         columns.add(new GenTableColumn(){{
@@ -87,13 +91,14 @@ public class BuildUtil {
             setIsInsert("1");
             setIsEdit("1");
             setIsList("1");
-            setIsQuery("0");
+            setIsQuery("1");
+            setQueryType("LIKE");
             setSort(6);
         }});
         columns.add(new GenTableColumn(){{
             setColumnName("is_formal");
             setColumnComment("是否正式产品");
-            setColumnId(7l);
+            setColumnId(8l);
             setJavaType("Integer");
             setJavaField("isFormal");
             setIsPk("1");
@@ -103,6 +108,32 @@ public class BuildUtil {
             setIsQuery("0");
             setSort(7);
         }});
+        columns.add(new GenTableColumn(){{
+            setColumnName("create_by");
+            setColumnComment("创建人");
+            setColumnId(8l);
+            setJavaType("String");
+            setJavaField("createBy");
+            setIsPk("0");
+            setIsInsert("1");
+            setIsEdit("0");
+            setIsList("1");
+            setIsQuery("0");
+            setSort(8);
+        }});
+        columns.add(new GenTableColumn(){{
+            setColumnName("create_time");
+            setColumnComment("创建时间");
+            setColumnId(9l);
+            setJavaType("Date");
+            setJavaField("createTime");
+            setIsPk("0");
+            setIsInsert("1");
+            setIsEdit("0");
+            setIsList("1");
+            setIsQuery("0");
+            setSort(9);
+        }});
         genTable.setColumns(columns);
         genTable.setTableName("pro_bom");
         genTable.setTableComment("BOM表");