Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_dashboard_back into zhc

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml

@@ -44,7 +44,10 @@
     <insert id="saveLevel" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
         INSERT INTO
         <include refid="selectTable" />
-        (company_id, name, `code`, remark, created_by, created_at)
+        (company_id, name, `code`, remark,
+            <if test="sortOrder != null">sort_order,</if>
+            created_by, created_at
+        )
         VALUES
         (
         #{companyId},
@@ -57,6 +60,7 @@
             <when test="remark != null and remark != ''">#{remark}</when>
             <otherwise>NULL</otherwise>
         </choose>,
+        <if test="sortOrder != null">#{sortOrder},</if>
         #{createdBy},
         #{createdAt}
         )
@@ -83,6 +87,9 @@
             name = #{name},
             `code` = #{code},
             remark = #{remark},
+            <if test="sortOrder != null">
+                sort_order = #{sortOrder},
+            </if>
             updated_at = #{updatedAt},
             updated_by = #{updatedBy}
         WHERE id = #{id}
@@ -116,6 +123,7 @@
         base.`name` AS levelName,
         base.`code` AS levelCode,
         base.remark,
+        base.sort_order,
         base.created_by,
         base.created_at,
         base.updated_by,
@@ -182,7 +190,7 @@
                 GROUP BY base.`id`
             </when>
         </choose>
-        order BY base.`id` desc
+        order BY base.sort_order desc, base.`id` desc
     </select>
 
     <select id="getBoundBuilding" resultType="java.lang.Long">
@@ -313,7 +321,7 @@
                 AND b.building_id IN <foreach collection="bindBuildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
             </if>
         </where>
-        order by br.id
+        order by br.sort_order desc, br.id desc
     </select>
 
     <delete id="deleteSiteBuildingRelation">

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/LevelEntity.java

@@ -33,6 +33,11 @@ public class LevelEntity {
      */
     private String remark;
 
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
     /**
      * 编码
      */

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/OptLevelParam.java

@@ -54,6 +54,12 @@ public class OptLevelParam {
     @Schema(description = "编码",example = "2cc")
     private String code;
 
+    /**
+     * 排序序号
+     */
+    @Schema(description = "排序序号",example = "1", required = false)
+    private Integer sortOrder;
+
 
     @Schema(description = "所属企业ID",example = "2", hidden = true)
     private Long companyId;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/level/LevelPageDTO.java

@@ -56,6 +56,12 @@ public class LevelPageDTO {
     @Schema(description = "备注",example = "2")
     private String remark;
 
+    /**
+     * 排序序号
+     */
+    @Schema(description = "排序序号",example = "1")
+    private Integer sortOrder;
+
 
     @Schema(description = "创建时间，毫秒级时间戳",example = "2")
     private Long createdAt;