oa初步完成

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

@@ -0,0 +1,31 @@
+package com.ruoyi.oa.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
+import com.ruoyi.oa.domain.vo.SysOaProjectVo;
+import com.ruoyi.oa.domain.vo.SysUserVo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LaborCostData extends BaseEntity {
+
+    // 对应用户
+    private SysUserVo sysUser;
+
+    // 计算月份
+    private Long generateMonth;
+
+    // 当前月的工作量
+    private Double workTimes;
+
+    // 捆绑的项目列表
+    private List<SysOaProjectVo> projects;
+
+    // 当月的所有签到信息
+    private List<SysOaAttendanceVo> attendances;
+
+
+
+}

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

@@ -39,11 +39,11 @@ public class SysOaAttendance extends BaseEntity {
     /**
      * 时长（天）1|0.5
      */
-    private Long dayLength;
+    private Double dayLength;
     /**
      * 时长（小时）
      */
-    private Long hour;
+    private Double hour;
     /**
      * 备注
      */

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

@@ -33,7 +33,6 @@ public class SysOaOutWarehouseBo extends BaseEntity {
     /**
      * 出库后对应的项目id
      */
-    @NotNull(message = "项目id不能为空",groups = { AddGroup.class })
     private Long projectId;
 
     /**

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

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.oa.domain.SysOaAttendance;
 import com.ruoyi.oa.domain.SysOaProject;
 import lombok.Data;
 
@@ -17,7 +18,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class SysOaAttendanceVo {
+public class SysOaAttendanceVo extends SysOaAttendance {
 
     private static final long serialVersionUID = 1L;
 
@@ -50,14 +51,14 @@ public class SysOaAttendanceVo {
      */
     @ExcelProperty(value = "时长", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "天=")
-    private Long dayLength;
+    private Double dayLength;
 
     /**
      * 时长（小时）
      */
     @ExcelProperty(value = "时长", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "小=时")
-    private Long hour;
+    private Double hour;
 
     /**
      * 备注
@@ -71,5 +72,11 @@ public class SysOaAttendanceVo {
 
     private String color;
 
+    private Long count;
+
+    // 单个工作时间
+    private Double workTimes;
+
+    private String projectName;
 
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.util.List;
@@ -15,7 +16,7 @@ import java.util.List;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class SysOaOutWarehouseListVo {
+public class SysOaOutWarehouseListVo extends BaseEntity {
     /**
      * ID 编号
      */

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

@@ -55,5 +55,10 @@ public class SysOaOutWarehouseVo extends BaseEntity {
     /** 项目名 */
     private String projectName;
 
+    /** 库存信息 */
+    private SysOaWarehouseVo warehouse;
+
+    /** 项目信息 */
+    private SysOaProjectVo project;
 
 }

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

@@ -186,4 +186,9 @@ public class SysOaProjectVo {
      */
     private String color;
 
+
+    /**
+     * 此项目数量 用户报工功能
+     */
+    private Long count;
 }

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

@@ -108,5 +108,9 @@ public class SysOaTaskVo {
      * */
     private List<SysUser> workerList;
 
+    /**
+     * 此任务总成本
+     */
+    private Double projectCostTotal;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.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.oa.domain.SysOaWarehouse;
 import lombok.Data;
 import java.util.Date;
 
@@ -17,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class SysOaWarehouseVo {
+public class SysOaWarehouseVo extends SysOaWarehouse {
 
     private static final long serialVersionUID = 1L;