优化工资计算逻辑

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

@@ -27,13 +27,11 @@ public class OaSalaryItemBo extends BaseEntity {
     /**
      * 主键id
      */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
     private Long salaryItemId;
 
     /**
      * 奖惩类型
      */
-    @NotNull(message = "奖惩类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long type;
 
     /**
@@ -44,13 +42,11 @@ public class OaSalaryItemBo extends BaseEntity {
     /**
      * 涉及金额
      */
-    @NotNull(message = "涉及金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private Double price;
 
     /**
      * 奖罚记号1奖0罚
      */
-    @NotNull(message = "奖罚记号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long flag;
 
     /**

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

@@ -70,4 +70,6 @@ public class OaSalaryVo extends OaSalary {
     private String remark;
 
     private List<OaSalaryItemVo> itemList;
+
+    private Double laborCost;
 }