diff --git a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespIndexVO.java b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespIndexVO.java index b26ca0f..6a2db76 100644 --- a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespIndexVO.java +++ b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespIndexVO.java @@ -54,6 +54,8 @@ public class ColumnInfoRespIndexVO { @Schema(description = "是否推荐(0否 1是)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer recommend; + @Schema(description = "排序") + private Integer sort; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") diff --git a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespVO.java b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespVO.java index c794764..3e0577a 100644 --- a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespVO.java +++ b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoRespVO.java @@ -38,6 +38,9 @@ public class ColumnInfoRespVO { @Schema(description = "是否推荐(0否 1是)") private Integer recommend; + @Schema(description = "排序") + private Integer sort; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoSaveReqVO.java b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoSaveReqVO.java index 6604a80..d3a9366 100644 --- a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoSaveReqVO.java +++ b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoSaveReqVO.java @@ -43,4 +43,7 @@ public class ColumnInfoSaveReqVO { @Schema(description = "是否推荐(0否 1是)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer recommend; + @Schema(description = "排序") + private Integer sort; + } \ No newline at end of file diff --git a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/dataobject/columninfo/ColumnInfoDO.java b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/dataobject/columninfo/ColumnInfoDO.java index 2be0226..de29e0b 100644 --- a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/dataobject/columninfo/ColumnInfoDO.java +++ b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/dataobject/columninfo/ColumnInfoDO.java @@ -68,7 +68,13 @@ public class ColumnInfoDO extends BaseDO { * 内容 */ private String content; - + /** + * 推荐 + */ private Integer recommend; + /** + * 排序 + */ + private Integer sort; } \ No newline at end of file diff --git a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/mysql/columninfo/ColumnInfoMapper.java b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/mysql/columninfo/ColumnInfoMapper.java index bed90f2..2e57579 100644 --- a/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/mysql/columninfo/ColumnInfoMapper.java +++ b/website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/mysql/columninfo/ColumnInfoMapper.java @@ -23,6 +23,7 @@ public interface ColumnInfoMapper extends BaseMapperX { .eqIfPresent(ColumnInfoDO::getInfoType, reqVO.getInfoType()) .eqIfPresent(ColumnInfoDO::getTitle, reqVO.getTitle()) .eqIfPresent(ColumnInfoDO::getSubtitle, reqVO.getSubtitle()) + .orderByAsc(ColumnInfoDO::getSort) .orderByDesc(ColumnInfoDO::getRecommend) .orderByDesc(ColumnInfoDO::getCreateTime)); }