feat(oa): 添加奖金和福利相关字段支持
- 在 OaSalaryDetail 实体类中新增 bonuses 和 bonusesDeducted 字段 - 在 OaSalaryDetailBo 业务对象中同步新增奖金相关字段 - 更新 MyBatis XML 映射文件,增加奖金字段的数据库列映射- 在服务实现类中为奖金字段添加查询条件支持 - 在 OaSalaryDetailVo 视图对象中配置 Excel 导出注解以支持奖金数据展示
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.oa.domain;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -92,6 +93,10 @@ public class OaSalaryDetail extends BaseEntity {
|
||||
* 出勤天数(模板2字段)
|
||||
*/
|
||||
private Long businessDays;
|
||||
/**
|
||||
* 奖金和福利
|
||||
*/
|
||||
private BigDecimal bonuses;
|
||||
/**
|
||||
* 请假扣款
|
||||
*/
|
||||
@@ -128,6 +133,10 @@ public class OaSalaryDetail extends BaseEntity {
|
||||
* 个人所得税
|
||||
*/
|
||||
private BigDecimal personalTax;
|
||||
/*
|
||||
*奖金福利已发放扣除
|
||||
*/
|
||||
private BigDecimal bonusesDeducted ;
|
||||
/**
|
||||
* 实发工资
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.oa.domain.bo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.ruoyi.common.core.validate.AddGroup;
|
||||
import com.ruoyi.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
@@ -106,6 +107,11 @@ public class OaSalaryDetailBo extends BaseEntity {
|
||||
* 出勤天数(模板2字段)
|
||||
*/
|
||||
private Long businessDays;
|
||||
/**
|
||||
* 奖金和福利
|
||||
*/
|
||||
|
||||
private BigDecimal bonuses;
|
||||
|
||||
/**
|
||||
* 请假扣款
|
||||
@@ -151,6 +157,10 @@ public class OaSalaryDetailBo extends BaseEntity {
|
||||
* 个人所得税
|
||||
*/
|
||||
private BigDecimal personalTax;
|
||||
/*
|
||||
*奖金福利已发放扣除
|
||||
*/
|
||||
private BigDecimal bonusesDeducted ;
|
||||
|
||||
/**
|
||||
* 实发工资
|
||||
|
||||
@@ -129,6 +129,11 @@ public class OaSalaryDetailVo {
|
||||
@ExcelDictFormat(readConverterExp = "模=板2字段")
|
||||
private Long businessDays;
|
||||
|
||||
/**
|
||||
* 奖金和福利
|
||||
*/
|
||||
@ExcelProperty(value = "奖金和福利")
|
||||
private BigDecimal bonuses;
|
||||
/**
|
||||
* 请假扣款
|
||||
*/
|
||||
@@ -182,7 +187,11 @@ public class OaSalaryDetailVo {
|
||||
*/
|
||||
@ExcelProperty(value = "个人所得税")
|
||||
private BigDecimal personalTax;
|
||||
|
||||
/*
|
||||
*奖金福利已发放扣除
|
||||
*/
|
||||
@ExcelProperty(value = "奖金福利已发放扣除")
|
||||
private BigDecimal bonusesDeducted ;
|
||||
/**
|
||||
* 实发工资
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user