From 89e166f18d6e33efde0dda97f1fb27f29e675660 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 05 八月 2024 17:57:45 +0800
Subject: [PATCH] 代码提交
---
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm | 244 +++++++++++++++++++++++++++++-------------------
1 files changed, 149 insertions(+), 95 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index 588d65c..ca7df28 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -1,135 +1,189 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
<resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
-#foreach ($column in $columns)
- <result property="${column.javaField}" column="${column.columnName}" />
-#end
+ #foreach ($column in $columns)
+ <result property="${column.javaField}" column="${column.columnName}"/>
+ #end
</resultMap>
-#if($table.sub)
+ #if($table.sub)
- <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
- <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
- </resultMap>
+ <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+ <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}"
+ javaType="java.util.List" resultMap="${subClassName}Result"/>
+ </resultMap>
- <resultMap type="${subClassName}" id="${subClassName}Result">
-#foreach ($column in $subTable.columns)
- <result property="${column.javaField}" column="sub_${column.columnName}" />
-#end
- </resultMap>
-#end
+ <resultMap type="${subClassName}" id="${subClassName}Result">
+ #foreach ($column in $subTable.columns)
+ <result property="${column.javaField}" column="sub_${column.columnName}"/>
+ #end
+ </resultMap>
+ #end
<sql id="select${ClassName}Vo">
- select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+ select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end
+ from ${tableName}
</sql>
- <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
+ <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}"
+ resultMap="${ClassName}Result">
<include refid="select${ClassName}Vo"/>
<where>
-#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")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName > #{$javaField}</if>
-#elseif($queryType == "GTE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName >= #{$javaField}</if>
-#elseif($queryType == "LT")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName < #{$javaField}</if>
-#elseif($queryType == "LTE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName <= #{$javaField}</if>
-#elseif($queryType == "LIKE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
- <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
+ #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")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName = #{$javaField}
+ </if>
+ #elseif($queryType == "NE")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName != #{$javaField}
+ </if>
+ #elseif($queryType == "GT")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName > #{$javaField}
+ </if>
+ #elseif($queryType == "GTE")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName >= #{$javaField}
+ </if>
+ #elseif($queryType == "LT")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName < #{$javaField}
+ </if>
+ #elseif($queryType == "LTE")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName <= #{$javaField}
+ </if>
+ #elseif($queryType == "LIKE")
+ <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end">
+ and $columnName like concat('%', #{$javaField}, '%')
+ </if>
+ #elseif($queryType == "BETWEEN")
+ <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''">
+ and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}
+ </if>
+ #end
+ #end
+ #end
</where>
</select>
- <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-#if($table.crud || $table.tree)
- <include refid="select${ClassName}Vo"/>
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#elseif($table.sub)
- select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
- #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
+ <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}"
+ resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
+ #if($table.crud || $table.tree)
+ <include refid="select${ClassName}Vo"/>
+ where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+ #elseif($table.sub)
+ select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
+ #foreach($column in $subTable.columns) b.$column.columnName as
+ sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
- from ${tableName} a
- left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
- where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
-#end
+ from ${tableName} a
+ left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
+ where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
+ #end
</select>
- <insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+ <insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment)
+ useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
insert into ${tableName}
<trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-#end
- </trim>
+ #foreach($column in $columns)
+ #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+ <if test="$column.javaField != null#if($column.javaType ==
+ 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,
+ </if>
+ #end
+ #end
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-#end
- </trim>
+ #foreach($column in $columns)
+ #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+ <if test="$column.javaField != null#if($column.javaType ==
+ 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},
+ </if>
+ #end
+ #end
+ </trim>
</insert>
<update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
update ${tableName}
<trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
-#end
-#end
+ #foreach($column in $columns)
+ #if($column.columnName != $pkColumn.columnName)
+ <if test="$column.javaField != null#if($column.javaType ==
+ 'String' && $column.required) and $column.javaField != ''#end">$column.columnName =
+ #{$column.javaField},
+ </if>
+ #end
+ #end
</trim>
where ${pkColumn.columnName} = #{${pkColumn.javaField}}
</update>
- <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
- delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
- </delete>
+ ## <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+ ## delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+ ## </delete>
+ <update id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+ update ${tableName}
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+ </update>
- <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
- delete from ${tableName} where ${pkColumn.columnName} in
+ ## <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+ ## delete from ${tableName} where ${pkColumn.columnName} in
+ ## <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
+ ## #{${pkColumn.javaField}}
+ ## </foreach>
+ ## </delete>
+ <update id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+ update ${tableName}
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where ${pkColumn.columnName} in
<foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
#{${pkColumn.javaField}}
</foreach>
- </delete>
-#if($table.sub)
+ </update>
- <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
- delete from ${subTableName} where ${subTableFkName} in
- <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
- #{${subTableFkclassName}}
- </foreach>
- </delete>
- <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
- delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
- </delete>
- <insert id="batch${subClassName}">
- 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($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
- </foreach>
- </insert>
-#end
+
+ #if($table.sub)
+
+ <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
+ delete from ${subTableName} where ${subTableFkName} in
+ <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
+ #{${subTableFkclassName}}
+ </foreach>
+ </delete>
+
+ <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
+ delete
+ from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
+ </delete>
+
+ <insert id="batch${subClassName}">
+ 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($column in $subTable.columns) #{item.$column.javaField
+ }#if($foreach.count != $subTable.columns.size()),#end#end)
+ </foreach>
+ </insert>
+ #end
</mapper>
--
Gitblit v1.9.3