导出包公表格

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

@@ -1,5 +1,7 @@
 package com.ruoyi.oa.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -7,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -81,5 +84,11 @@ public class OaProjectReportBo extends BaseEntity {
      */
     private Long workType;
 
+    // 新增：多用户ID和时间范围
+    private List<Long> userIds;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
@@ -36,6 +38,7 @@ public class OaProjectReportVo {
     /**
      * 经办人姓名
      */
+    @ExcelProperty(value = "姓名")
     private String nickName;
 
     /**
@@ -58,6 +61,7 @@ public class OaProjectReportVo {
     /**
      * 项目名称
      */
+    @ExcelProperty(value = "项目名称")
     private String projectName;
 
     /**
@@ -85,8 +89,13 @@ public class OaProjectReportVo {
     /**
      * 是否出差
      */
-    private Long isTrip;
 
+    private Long isTrip;
+    /**
+     * 是否出差
+     */
+    @ExcelProperty(value = "是否出差")
+    private String trip;
     /**
      * 报工次数
      */
@@ -109,6 +118,9 @@ public class OaProjectReportVo {
     /**
      * 报工时间
      */
+    @ExcelProperty(value = "报工时间")
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss") // EasyExcel注解
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // Jackson注解，便于前后端一致
     private Date createTime;
 
      /**