From 04e89af0abada43c1bc7534aee5599906d39fdcf Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Sat, 14 Aug 2021 19:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=8A=A8=E6=8E=92=E7=89=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BF=9D=E5=AD=98=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picturesmplate-mapper.xml                 | 31 ++++++++++++++-----
 .../save-picturestemplate.html                |  6 ++++
 .../update-picturestemplate.html              |  6 ++++
 .../PicturesTemplateBuildingDTO.java          | 10 ++++++
 .../picturestemplate/PicturesTemplateDTO.java | 10 ++++++
 .../picturestemplate/PicturesTemplateVO.java  | 10 ++++++
 6 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplate/picturesmplate-mapper.xml b/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplate/picturesmplate-mapper.xml
index 419282e..02f5f31 100644
--- a/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplate/picturesmplate-mapper.xml
+++ b/module-building-pictures/src/main/resources/mybatis/mapper/picturestemplate/picturesmplate-mapper.xml
@@ -19,6 +19,7 @@
         <result column="pictures_template_picture" property="picturesTemplatePicture"/>
         <result column="pictures_template_picture_url" property="picturesTemplatePictureUrl"/>
         <result column="pictures_template_remark" property="picturesTemplateRemark"/>
+        <result column="pictures_template_order" property="picturesTemplateOrder"/>
     </resultMap>
 
     <resultMap id="picturesTemplateBuildingDTO" type="cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateBuildingDTO">
@@ -32,6 +33,7 @@
         <result column="pictures_template_picture" property="picturesTemplatePicture"/>
         <result column="pictures_template_picture_url" property="picturesTemplatePictureUrl"/>
         <result column="pictures_template_remark" property="picturesTemplateRemark"/>
+        <result column="pictures_template_order" property="picturesTemplateOrder"/>
     </resultMap>
 
     <!-- 供外部接口调用使用 -->
@@ -46,11 +48,14 @@
             t1.pictures_template_publish_status,
             t1.pictures_template_picture,
             t1.pictures_template_picture_url,
-            t1.pictures_template_remark
+            t1.pictures_template_remark,
+            t1.pictures_template_order
         FROM
             m_pictures_template t1
         WHERE
             t1.is_delete = 0 AND t1.pictures_template_id = #{picturesTemplateId}
+        ORDER BY
+            t1.pictures_template_order , t1.gmt_create DESC
     </select>
 
     <!-- 供外部接口调用使用 -->
@@ -65,7 +70,8 @@
             t1.pictures_template_publish_status,
            /* t1.pictures_template_picture,*/
             t1.pictures_template_picture_url,
-            t1.pictures_template_remark
+            t1.pictures_template_remark,
+            t1.pictures_template_order
         FROM
             m_pictures_template t1
         WHERE
@@ -88,7 +94,7 @@
                 #{picturesTemplateIds[${index}]}
             </foreach>
         </if>
-        ORDER BY t1.gmt_create
+        ORDER BY t1.pictures_template_order , t1.gmt_create DESC
     </select>
 
     <update id="updatePicturesTemplatePicture" parameterType="map">
@@ -152,11 +158,13 @@
             t1.pictures_template_size,
             t1.pictures_template_picture,
             t1.pictures_template_picture_url,
-            t1.pictures_template_remark
+            t1.pictures_template_remark,
+            t1.pictures_template_order
         FROM
             m_pictures_template t1
         WHERE
             t1.is_delete = 0 AND t1.pictures_template_code = #{picturesTemplateCode}
+        ORDER BY t1.pictures_template_order , t1.gmt_create DESC
     </select>
 
     <!-- 新增图片套版的模板管理 -->
@@ -177,6 +185,7 @@
             pictures_template_size,
             pictures_template_picture,
             pictures_template_remark,
+            pictures_template_order,
             creator,
             gmt_create,
             modifier,
@@ -198,6 +207,7 @@
             #{picturesTemplateSize},
             '',
             #{picturesTemplateRemark},
+            #{picturesTemplateOrder},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -260,6 +270,9 @@
         </if>
         <if test="picturesTemplateRemark != null and picturesTemplateRemark != ''">
             pictures_template_remark = #{picturesTemplateRemark},
+        </if>
+        <if test="picturesTemplateOrder != null">
+            pictures_template_order = #{picturesTemplateOrder},
         </if>
             pictures_template_file = #{picturesTemplateFile},
             modifier = #{modifier},
@@ -286,7 +299,8 @@
             t1.pictures_template_size,
             t1.pictures_template_picture,
             t1.pictures_template_picture_url,
-            t1.pictures_template_remark
+            t1.pictures_template_remark,
+            t1.pictures_template_order
         FROM
             m_pictures_template t1
         WHERE
@@ -295,7 +309,7 @@
         AND
             t1.pictures_template_id = #{picturesTemplateId}
         </if>
-        ORDER BY t1.gmt_create
+        ORDER BY t1.pictures_template_order , t1.gmt_create DESC
     </select>
 
     <!-- 图片套版的模板管理列表 -->
@@ -316,7 +330,8 @@
             t1.pictures_template_size,
             t1.pictures_template_picture,
             t1.pictures_template_picture_url,
-            t1.pictures_template_remark
+            t1.pictures_template_remark,
+            t1.pictures_template_order
         FROM
             m_pictures_template t1
         WHERE
@@ -350,7 +365,7 @@
             #{picturesTemplateIds[${index}]}
             </foreach>
         </if>
-        ORDER BY t1.gmt_create
+        ORDER BY t1.pictures_template_order , t1.gmt_create DESC
     </select>
 
     <!-- 图片套版的模板管理统计  -->
diff --git a/module-building-pictures/src/main/resources/templates/picturestemplate/save-picturestemplate.html b/module-building-pictures/src/main/resources/templates/picturestemplate/save-picturestemplate.html
index 25efdeb..7716f1b 100644
--- a/module-building-pictures/src/main/resources/templates/picturestemplate/save-picturestemplate.html
+++ b/module-building-pictures/src/main/resources/templates/picturestemplate/save-picturestemplate.html
@@ -35,6 +35,12 @@
                         <input type="text" id="picturesTemplateTitle" name="picturesTemplateTitle" class="layui-input" value="" placeholder="请输入套版名称" lay-verify="required">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">套版排序<span style="color: red">*</span></label>
+                    <div class="layui-input-block">
+                        <input type="number" step="0.01" id="picturesTemplateOrder" name="picturesTemplateOrder" class="layui-input" value="1" placeholder="请输入套版排序" lay-verify="required">
+                    </div>
+                </div>
 <!--                <div class="layui-form-item">-->
 <!--                    <label class="layui-form-label">画板高度<span style="color: red">*</span></label>-->
 <!--                    <div class="layui-input-block">-->
diff --git a/module-building-pictures/src/main/resources/templates/picturestemplate/update-picturestemplate.html b/module-building-pictures/src/main/resources/templates/picturestemplate/update-picturestemplate.html
index 83ca381..5e8077e 100644
--- a/module-building-pictures/src/main/resources/templates/picturestemplate/update-picturestemplate.html
+++ b/module-building-pictures/src/main/resources/templates/picturestemplate/update-picturestemplate.html
@@ -35,6 +35,12 @@
                         <input type="text" id="picturesTemplateTitle" name="picturesTemplateTitle" class="layui-input" value="" placeholder="请输入套版名称" lay-verify="required">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">套版排序<span style="color: red">*</span></label>
+                    <div class="layui-input-block">
+                        <input type="number" step="0.01" id="picturesTemplateOrder" name="picturesTemplateOrder" class="layui-input" value="1" placeholder="请输入套版排序" lay-verify="required">
+                    </div>
+                </div>
 <!--                <div class="layui-form-item">-->
 <!--                    <label class="layui-form-label">画板高度<span style="color: red">*</span></label>-->
 <!--                    <div class="layui-input-block">-->
diff --git a/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateBuildingDTO.java b/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateBuildingDTO.java
index 7474eeb..40d2498 100644
--- a/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateBuildingDTO.java
+++ b/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateBuildingDTO.java
@@ -39,6 +39,16 @@ public class PicturesTemplateBuildingDTO implements Cloneable {
     protected String picturesTemplateRemark;
     @ApiModelProperty(name = "picturesTemplatePublishStatus", value = "发布状态")
     protected String picturesTemplatePublishStatus;
+    @ApiModelProperty(name = "picturesTemplateOrder", value = "排序")
+    private Integer picturesTemplateOrder;
+
+    public Integer getPicturesTemplateOrder() {
+        return picturesTemplateOrder;
+    }
+
+    public void setPicturesTemplateOrder(Integer picturesTemplateOrder) {
+        this.picturesTemplateOrder = picturesTemplateOrder;
+    }
 
     public String getPicturesTemplatePictureUrl() {
         return picturesTemplatePictureUrl == null ? "" : picturesTemplatePictureUrl;
diff --git a/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java b/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
index 0192903..a44252f 100644
--- a/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
+++ b/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
@@ -53,6 +53,16 @@ public class PicturesTemplateDTO {
     private String picturesTemplatePictureUrl;
     @ApiModelProperty(name = "picturesTemplateRemark", value = "备注说明")
     private String picturesTemplateRemark;
+    @ApiModelProperty(name = "picturesTemplateOrder", value = "排序")
+    private Integer picturesTemplateOrder;
+
+    public Integer getPicturesTemplateOrder() {
+        return picturesTemplateOrder;
+    }
+
+    public void setPicturesTemplateOrder(Integer picturesTemplateOrder) {
+        this.picturesTemplateOrder = picturesTemplateOrder;
+    }
 
     public String getPicturesTemplatePictureUrl() {
         return picturesTemplatePictureUrl == null ? "" : picturesTemplatePictureUrl;
diff --git a/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateVO.java b/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateVO.java
index b7d73f0..bde9631 100644
--- a/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateVO.java
+++ b/pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateVO.java
@@ -51,6 +51,16 @@ public class PicturesTemplateVO {
     private String picturesTemplatePicture;
     @ApiModelProperty(name = "picturesTemplatePictureUrl", value = "预览图ID")
     private String picturesTemplatePictureUrl;
+    @ApiModelProperty(name = "picturesTemplateOrder", value = "排序")
+    private Integer picturesTemplateOrder;
+
+    public Integer getPicturesTemplateOrder() {
+        return picturesTemplateOrder;
+    }
+
+    public void setPicturesTemplateOrder(Integer picturesTemplateOrder) {
+        this.picturesTemplateOrder = picturesTemplateOrder;
+    }
 
     public String getPicturesTemplatePictureUrl() {
         return picturesTemplatePictureUrl == null ? "" : picturesTemplatePictureUrl;