From 535d843036af703c0992b80101c4ef57e56bf74a Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sun, 22 Feb 2026 14:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=85=A8=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/biz/entity/BizNotes.java | 19 +- web-vue/packages/biz/api/biz/notes.ts | 6 + .../desktop/workbench/components/NoteTodo.vue | 1018 +++++++++++------ 3 files changed, 695 insertions(+), 348 deletions(-) diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizNotes.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizNotes.java index 42217f2b..c19a282d 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizNotes.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizNotes.java @@ -3,13 +3,6 @@ package com.jeesite.modules.biz.entity; import java.io.Serializable; import java.util.Date; -import com.jeesite.common.mybatis.annotation.JoinTable; -import com.jeesite.common.mybatis.annotation.JoinTable.Type; -import com.fasterxml.jackson.annotation.JsonFormat; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import jakarta.validation.constraints.NotNull; - import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; import com.jeesite.common.mybatis.annotation.Table; @@ -29,8 +22,14 @@ import java.io.Serial; @Table(name = "biz_notes", alias = "a", label = "便签管理表信息", columns = { @Column(name = "create_time", attrName = "createTime", label = "创建时间", isUpdate = false, isQuery = false, isUpdateForce = true), @Column(name = "id", attrName = "id", label = "便签唯一标识", isPK = true), + @Column(name = "title", attrName = "title", label = "便签主题", queryType = QueryType.LIKE), @Column(name = "content", attrName = "content", label = "便签内容", queryType = QueryType.LIKE), + @Column(name = "priority", attrName = "priority", label = "便签级别"), @Column(name = "ustatus", attrName = "ustatus", label = "便签状态"), + @Column(name = "start_time", attrName = "startTime", label = "开始时间"), + @Column(name = "end_time", attrName = "endTime", label = "结束时间"), + @Column(name = "type", attrName = "type", label = "便签类型"), + @Column(name = "deadline", attrName = "deadline", label = "截至时间"), @Column(name = "update_time", attrName = "updateTime", label = "更新时间"), @Column(name = "create_user", attrName = "createUser", label = "创建用户", isUpdate = false, isUpdateForce = true), }, orderBy = "a.create_time DESC" @@ -41,8 +40,14 @@ public class BizNotes extends DataEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; private Date createTime; // 创建时间 + private String title; private String content; // 便签内容 + private String priority; private String ustatus; // 便签状态 + private Date startTime; + private Date endTime; + private String type; + private Date deadline; private Date updateTime; // 更新时间 private String createUser; // 创建用户 diff --git a/web-vue/packages/biz/api/biz/notes.ts b/web-vue/packages/biz/api/biz/notes.ts index 879973b0..75eec8d2 100644 --- a/web-vue/packages/biz/api/biz/notes.ts +++ b/web-vue/packages/biz/api/biz/notes.ts @@ -11,8 +11,14 @@ const { adminPath } = useGlobSetting(); export interface BizNotes extends BasicModel { createTime?: string; // 创建时间 + title: string; content: string; // 便签内容 + priority: string; ustatus: string; // 便签状态 + startTime: string; + endTime: string; + type: string; + deadline?: string; updateTime: string; // 更新时间 createUser?: string; // 创建用户 } diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/NoteTodo.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/NoteTodo.vue index 1b81f182..90d5b01e 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/NoteTodo.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/NoteTodo.vue @@ -1,219 +1,361 @@ - \ No newline at end of file