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 @@
+
@@ -32,6 +33,7 @@
+
@@ -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
@@ -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}]}
- ORDER BY t1.gmt_create
+ ORDER BY t1.pictures_template_order , t1.gmt_create DESC
@@ -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
@@ -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 @@
pictures_template_remark = #{picturesTemplateRemark},
+
+
+ pictures_template_order = #{picturesTemplateOrder},
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}
- ORDER BY t1.gmt_create
+ ORDER BY t1.pictures_template_order , t1.gmt_create DESC
@@ -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}]}
- ORDER BY t1.gmt_create
+ ORDER BY t1.pictures_template_order , t1.gmt_create DESC
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 @@
+
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 @@
+
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;