成本分析修改3

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

@@ -0,0 +1,12 @@
+package com.ruoyi.oa.domain.vo;
+
+import lombok.Data;
+
+// 报销明细VO
+@Data
+public class ClaimVO {
+    private Long claimId;
+    private String nickName;
+    private Double cost;
+    private String remark;
+}

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

@@ -0,0 +1,12 @@
+package com.ruoyi.oa.domain.vo;
+
+import lombok.Data;
+
+// 物料出库明细VO
+@Data
+public class MaterialVO {
+    private Long materialId;
+    private String name;
+    private Double price;
+    private Integer amount;
+}

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

@@ -1,34 +0,0 @@
-package com.ruoyi.oa.domain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SysOaCostList {
-    /**
-     * userCostList
-     */
-    private Long userId;
-    private String nickName;
-    private Double laborCost;
-    private Double attendanceNum;
-
-    /**
-     * materialList
-     */
-    private Long materialId;
-    private String name;
-    private Double price;
-    private Long amount;
-
-    /**
-     * claimList
-     */
-    private Long claimId;
-    //  private String nickName; 申请人姓名
-    private Double cost;
-    private String remark;
-}

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

@@ -6,8 +6,7 @@ import java.util.List;
 
 @Data
 public class SysOaCostRow {
-    List<SysOaCostList> userCostList;
-    List<SysOaCostList> materialList;
-    List<SysOaCostList> claimList;
-    List<SysOaCostList> otherList;
+    private List<UserCostVO> userCostList;
+    private List<MaterialVO> materialList;
+    private List<ClaimVO> claimList;
 }

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

@@ -0,0 +1,12 @@
+package com.ruoyi.oa.domain.vo;
+
+import lombok.Data;
+
+// 人力成本明细VO
+@Data
+public class UserCostVO {
+    private Long userId;
+    private String nickName;
+    private Double laborCost; // 计算结果字段
+    private Double attendenceNum; // 计算结果字段
+}