diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MySchedule.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MySchedule.java index 14ffde2..432ee04 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MySchedule.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MySchedule.java @@ -34,7 +34,7 @@ import java.io.Serial; @Column(name = "title", attrName = "title", label = "日程标题", queryType = QueryType.LIKE), @Column(name = "content", attrName = "content", label = "日程内容", isQuery = false), @Column(name = "schedule_type", attrName = "scheduleType", label = "日程类型"), - @Column(name = "start_time", attrName = "startTime", label = "开始时间", isQuery = false, isUpdateForce = true), + @Column(name = "start_time", attrName = "startTime", label = "开始时间", isUpdateForce = true), @Column(name = "end_time", attrName = "endTime", label = "结束时间", isQuery = false, isUpdateForce = true), @Column(name = "priority", attrName = "priority", label = "优先等级"), @Column(name = "ustatus", attrName = "ustatus", label = "日程状态"), @@ -105,4 +105,13 @@ public class MySchedule extends DataEntity implements Serializable { sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); } + + public Date getStartTime_gte() { + return sqlMap.getWhere().getValue("start_time", QueryType.GTE); + } + + public void setStartTime_gte(Date startTime) { + sqlMap.getWhere().and("start_time", QueryType.GTE, startTime); + } + } \ No newline at end of file diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/ScheduleInfo.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/ScheduleInfo.vue index 6858a81..beb9a28 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/ScheduleInfo.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/ScheduleInfo.vue @@ -2,6 +2,7 @@
日程信息 + 更多
@@ -21,7 +22,7 @@
今日安排
-
连续刻度展示 08:00 - 18:00 日程
+
展示 08:00 - 18:00 日程
{{ todayLabel }} {{ currentTimeLabel }}
@@ -45,10 +46,6 @@ > @@ -90,8 +83,15 @@