From db717d25ac048517daebd30745ffae7927961255 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Tue, 19 Aug 2025 09:38:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E9=97=AE=E9=A2=98=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E5=88=9B=E5=BB=BA=E8=80=85=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OaFeedbackMapper.xml 中添加 create_time 和 create_by 字段的查询
- 在 OaFeedbackVo.java 中添加 createTime 和 createBy属性
- 使用 @JsonFormat 注解格式化创建时间
-让 OaFeedbackVo 继承 BaseEntity 以复用基础实体类的功能
---
 .../com/ruoyi/oa/domain/vo/OaFeedbackVo.java   | 18 +++++++++++++-----
 .../resources/mapper/oa/OaFeedbackMapper.xml   |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java
index d505baf..6bc4d92 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java
@@ -2,11 +2,11 @@ package com.ruoyi.oa.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import java.util.Date;
 
+import java.util.Date;
 
 
 /**
@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class OaFeedbackVo {
+public class OaFeedbackVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -70,11 +70,19 @@ public class OaFeedbackVo {
      */
     private String projectCode;
 
-
     /**
      * 项目编号
      */
     private String projectNum;
 
+    /**
+     * 创建者
+     */
+    private String createBy;
 
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml
index ad5b96b..1c9be1f 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml
@@ -44,6 +44,8 @@
             oaf.content,
             oaf.status,
             oaf.title,
+            oaf.create_time,
+            oaf.create_by,
             oaf.project_id,
             sop.project_name,
             sop.project_code,