增加动态表单自动排版配置界面的保存回显逻辑

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>
 
     <!-- 图片套版的模板管理统计  -->

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">-->

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">-->

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;

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;

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;