Browse Source

fix 排序

Administrator 1 year ago
parent
commit
f3b5d67906

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/annex/BomanAnnexController.java

@@ -76,6 +76,7 @@ public class BomanAnnexController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BomanAnnex bomanAnnex)
     {
+
         return toAjax(bomanAnnexService.insertBomanAnnex(bomanAnnex));
     }
 

+ 11 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanAnnex.java

@@ -30,6 +30,7 @@ public class BomanAnnex extends BaseEntity
     /** 附件名称 */
     @Excel(name = "附件名称")
     private String annexName;
+    private String annexVoid;
 
     /** 附件类型1:vr */
     @Excel(name = "附件类型1:vr")
@@ -50,6 +51,14 @@ public class BomanAnnex extends BaseEntity
      */
     private String dimension;
 
+    public String getAnnexVoid() {
+        return annexVoid;
+    }
+
+    public void setAnnexVoid(String annexVoid) {
+        this.annexVoid = annexVoid;
+    }
+
     public String getDimension() {
         return dimension;
     }
@@ -127,11 +136,12 @@ public class BomanAnnex extends BaseEntity
                 "annexId=" + annexId +
                 ", annexUrl='" + annexUrl + '\'' +
                 ", annexName='" + annexName + '\'' +
+                ", annexVoid='" + annexVoid + '\'' +
                 ", type='" + type + '\'' +
                 ", keywords='" + keywords + '\'' +
                 ", releaseTime=" + releaseTime +
                 ", bomanAnnexList=" + bomanAnnexList +
-                ", dimension=" + dimension +
+                ", dimension='" + dimension + '\'' +
                 '}';
     }
 }

+ 3 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanAnnexServiceImpl.java

@@ -56,6 +56,9 @@ public class BomanAnnexServiceImpl implements IBomanAnnexService
         List<BomanAnnex> bomanAnnexList = bomanAnnex.getBomanAnnexList();
         int i = 0;
         if (bomanAnnexList != null && bomanAnnexList.size() > 0){
+            for (BomanAnnex annex : bomanAnnexList) {
+                annex.setReleaseTime(bomanAnnex.getReleaseTime());
+            }
              i = bomanAnnexMapper.batchBomanAnnex(bomanAnnexList);
         }
         return i;

+ 8 - 3
ruoyi-system/src/main/resources/mapper/system/BomanAnnexMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="annexId"    column="annex_id"    />
         <result property="annexUrl"    column="annex_url"    />
         <result property="annexName"    column="annex_name"    />
+        <result property="annexVoid"    column="annex_void"    />
         <result property="type"    column="type"    />
         <result property="keywords"    column="keywords"    />
         <result property="dimension"    column="dimension"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBomanAnnexVo">
-        select annex_id, annex_url, annex_name, 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, type,dimension, keywords, release_time, create_time, create_by, update_by, update_time from boman_annex
     </sql>
 
     <select id="selectBomanAnnexList" parameterType="BomanAnnex" resultMap="BomanAnnexResult">
@@ -31,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="keywords != null  and keywords != ''"> and keywords = #{keywords}</if>
             <if test="releaseTime != null "> and release_time = #{releaseTime}</if>
         </where>
+        order by create_by DESC
     </select>
     
     <select id="selectBomanAnnexByAnnexId" parameterType="Long" resultMap="BomanAnnexResult">
@@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <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="type != null">type,</if>
             <if test="dimension != null ">dimension,</if>
             <if test="keywords != null and keywords != ''">keywords,</if>
@@ -55,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="annexUrl != null and annexUrl != ''">#{annexUrl},</if>
             <if test="annexName != null ">#{annexName},</if>
+            <if test="annexVoid != null ">#{annexVoid},</if>
             <if test="type != null">#{type},</if>
             <if test="dimension != null and dimension != ''">#{dimension},</if>
             <if test="keywords != null and keywords != ''">#{keywords},</if>
@@ -67,9 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="batchBomanAnnex">
-        insert into boman_annex(annex_url, annex_name,keywords,dimension,type,create_time) values
+        insert into boman_annex(annex_url, annex_name,annex_void,keywords,dimension,type,create_time) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.annexUrl},#{item.annexName},#{item.keywords},#{item.dimension},#{item.type},sysdate())
+            (#{item.annexUrl},#{item.annexName},#{item.keywords},#{item.annexVoid},#{item.dimension},#{item.type},sysdate())
         </foreach>
     </insert>
     <update id="updateBomanAnnex" parameterType="BomanAnnex">
@@ -77,6 +81,7 @@ 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="type != null">type = #{type},</if>
             <if test="dimension != null ">dimension = #{dimension},</if>
             <if test="keywords != null and keywords != ''">keywords = #{keywords},</if>