Browse Source

优化代码生成模板格式

RuoYi 1 year ago
parent
commit
0e08cc7ca4

+ 1 - 1
ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -71,9 +71,9 @@ public class ${ClassName} extends ${Entity}
     {
     {
         return $column.javaField;
         return $column.javaField;
     }
     }
+
 #end
 #end
 #end
 #end
-
 #if($table.sub)
 #if($table.sub)
     public List<${subClassName}> get${subClassName}List()
     public List<${subClassName}> get${subClassName}List()
     {
     {

+ 3 - 3
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -79,13 +79,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
 #end
 #end
     </select>
     </select>
-
+#if($table.sub)
     <select id="select${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">
     <select id="select${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">
         select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
         select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
         from ${subTableName}
         from ${subTableName}
         where ${subTableFkName} = #{${subTableFkName}}
         where ${subTableFkName} = #{${subTableFkName}}
     </select>
     </select>
-
+#end
     <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
     <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
         insert into ${tableName}
         insert into ${tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <insert id="batch${subClassName}">
     <insert id="batch${subClassName}">
         insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
         insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
-		<foreach item="item" index="index" collection="list" separator=",">
+        <foreach item="item" index="index" collection="list" separator=",">
             (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
             (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
         </foreach>
         </foreach>
     </insert>
     </insert>