oa二期内容更新

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

@@ -1,5 +1,6 @@
 package com.ruoyi.oa.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -9,6 +10,7 @@ import javax.validation.constraints.*;
 import java.util.Date;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 文件存储业务对象 sys_oa_file
@@ -46,4 +48,11 @@ public class SysOaFileBo extends BaseEntity {
     private String remark;
 
 
+    /**
+     * 查询月份
+     */
+    private String queryCreateTime;
+
+
+
 }

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

@@ -4,6 +4,7 @@ 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.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -17,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class SysOaFileVo {
+public class SysOaFileVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -36,7 +37,7 @@ public class SysOaFileVo {
     /**
      * 文件类型0打卡1出入库
      */
-    @ExcelProperty(value = "文件类型0打卡1出入库", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "文件类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "file_status")
     private Long status;
 

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

@@ -191,4 +191,9 @@ public class SysOaProjectVo {
      * 此项目数量 用户报工功能
      */
     private Long count;
+
+    /**
+     *  人力资源成本
+     */
+    private Double laborCost;
 }