Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFeedback.java

@@ -47,4 +47,9 @@ public class OaFeedback extends BaseEntity {
 
     private String title;
 
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java

@@ -1,14 +1,12 @@
 package com.ruoyi.oa.domain.bo;
 
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
 import java.util.Date;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 问题反馈业务对象 oa_feedback
@@ -44,4 +42,19 @@ public class OaFeedbackBo extends BaseEntity {
     private Long state;
 
     private String title;
+
+    private String projectName;
+
+    private Long projectId;
+    /**
+     * 区间开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 区间结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 }

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;
 
@@ -50,7 +50,39 @@ public class OaFeedbackVo {
     @ExcelProperty(value = "")
     private Long state;
 
+    /**
+     * 标题
+     */
     private String title;
 
+    /**
+     * 项目id
+     */
+    private Long projectId;
 
+    /**
+     * 项目名
+     */
+    private String projectName;
+
+    /**
+     * 项目代号
+     */
+    private String projectCode;
+
+    /**
+     * 项目编号
+     */
+    private String projectNum;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
 }