fix 排序

ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanAnnex.java

@@ -31,6 +31,7 @@ public class BomanAnnex extends BaseEntity
     @Excel(name = "附件名称")
     private String annexName;
     private String annexVoid;
+    private String annexVoidName;
 
     /** 附件类型1:vr */
     @Excel(name = "附件类型1:vr")
@@ -51,6 +52,14 @@ public class BomanAnnex extends BaseEntity
      */
     private String dimension;
 
+    public String getAnnexVoidName() {
+        return annexVoidName;
+    }
+
+    public void setAnnexVoidName(String annexVoidName) {
+        this.annexVoidName = annexVoidName;
+    }
+
     public String getAnnexVoid() {
         return annexVoid;
     }

ruoyi-system/src/main/resources/mapper/system/BomanAnnexMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="annexUrl"    column="annex_url"    />
         <result property="annexName"    column="annex_name"    />
         <result property="annexVoid"    column="annex_void"    />
+        <result property="annexVoidName"    column="annex_void_name"    />
         <result property="type"    column="type"    />
         <result property="keywords"    column="keywords"    />
         <result property="dimension"    column="dimension"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBomanAnnexVo">
-        select annex_id, annex_url, annex_name,annex_void, type,dimension, keywords, release_time, create_time, create_by, update_by, update_time from boman_annex
+        select annex_id, annex_url, annex_name,annex_void,annex_void_name, type,dimension, keywords, release_time, create_time, create_by, update_by, update_time from boman_annex
     </sql>
 
     <select id="selectBomanAnnexList" parameterType="BomanAnnex" resultMap="BomanAnnexResult">
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="annexUrl != null and annexUrl != ''">annex_url,</if>
             <if test="annexName != null and annexName != ''">annex_name,</if>
             <if test="annexVoid != null and annexVoid != ''">annex_void,</if>
+            <if test="annexVoidName != null and annexVoidName != ''">annex_void_name,</if>
             <if test="type != null">type,</if>
             <if test="dimension != null ">dimension,</if>
             <if test="keywords != null and keywords != ''">keywords,</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="annexUrl != null and annexUrl != ''">#{annexUrl},</if>
             <if test="annexName != null ">#{annexName},</if>
             <if test="annexVoid != null ">#{annexVoid},</if>
+            <if test="annexVoidName != null ">#{annexVoidName},</if>
             <if test="type != null">#{type},</if>
             <if test="dimension != null and dimension != ''">#{dimension},</if>
             <if test="keywords != null and keywords != ''">#{keywords},</if>
@@ -71,9 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="batchBomanAnnex">
-        insert into boman_annex(annex_url, annex_name,annex_void,keywords,dimension,type,create_time) values
+        insert into boman_annex(annex_url, annex_name,annex_void,annex_void_name,keywords,dimension,type,create_time) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.annexUrl},#{item.annexName},#{item.keywords},#{item.annexVoid},#{item.dimension},#{item.type},sysdate())
+            (#{item.annexUrl},#{item.annexName},#{item.keywords},#{item.annexVoid},#{item.annexVoidName},#{item.dimension},#{item.type},sysdate())
         </foreach>
     </insert>
     <update id="updateBomanAnnex" parameterType="BomanAnnex">
@@ -81,7 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="annexUrl != null and annexUrl != ''">annex_url = #{annexUrl},</if>
             <if test="annexName != null and annexName != ''">annex_name = #{annexName},</if>
-            <if test="item.annexVoid != null and item.annexVoid != ''">item.annex_void = #{item.annexVoid},</if>
+            <if test="annexVoid != null and annexVoid != ''">annex_void = #{annexVoid},</if>
+            <if test="annexVoidName != null and annexVoidName != ''">annex_void_name = #{annexVoidName},</if>
             <if test="type != null">type = #{type},</if>
             <if test="dimension != null ">dimension = #{dimension},</if>
             <if test="keywords != null and keywords != ''">keywords = #{keywords},</if>