diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
index 4b3a4a41..99a9d33c 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
@@ -66,17 +66,17 @@ public class AnnouncementVO extends BaseVO {
*
* @return 公告状态
*/
- @Schema(description = "状态(1:已发布,2:已过期)", example = "1")
+ @Schema(description = "状态(1:待发布,2:已发布,3:已过期)", example = "1")
public Integer getStatus() {
- int status = 1;
+ int status = 2;
if (null != this.effectiveTime) {
if (this.effectiveTime.isAfter(LocalDateTime.now())) {
- status = 2;
+ status = 1;
}
}
if (null != this.terminateTime) {
if (this.terminateTime.isBefore(LocalDateTime.now())) {
- status = 2;
+ status = 3;
}
}
return status;
diff --git a/continew-admin-ui/src/views/system/announcement/index.vue b/continew-admin-ui/src/views/system/announcement/index.vue
index 40bfecd2..a0f7a910 100644
--- a/continew-admin-ui/src/views/system/announcement/index.vue
+++ b/continew-admin-ui/src/views/system/announcement/index.vue
@@ -135,8 +135,9 @@
- 已发布
- 已过期
+ 待发布
+ 已发布
+ 已过期