|
|
|
@ -5,7 +5,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
|
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
|
import com.ruoyi.common.annotation.ExcelDictFormat;
|
|
|
|
import com.ruoyi.common.annotation.ExcelDictFormat;
|
|
|
|
import com.ruoyi.common.convert.ExcelDictConvert;
|
|
|
|
import com.ruoyi.common.convert.ExcelDictConvert;
|
|
|
|
|
|
|
|
import com.ruoyi.common.core.domain.BaseEntity;
|
|
|
|
import lombok.Data;
|
|
|
|
import lombok.Data;
|
|
|
|
|
|
|
|
import lombok.EqualsAndHashCode;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -25,13 +28,13 @@ public class PaySalaryReportVo {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 主键
|
|
|
|
* 主键
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ExcelProperty(value = "主键")
|
|
|
|
// @ExcelProperty(value = "主键")
|
|
|
|
private Long id;
|
|
|
|
private Long id;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 租户id
|
|
|
|
* 租户id
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ExcelProperty(value = "租户id")
|
|
|
|
// @ExcelProperty(value = "租户id")
|
|
|
|
private Long tenantId;
|
|
|
|
private Long tenantId;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -49,7 +52,7 @@ public class PaySalaryReportVo {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 部门id
|
|
|
|
* 部门id
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ExcelProperty(value = "部门id")
|
|
|
|
// @ExcelProperty(value = "部门id")
|
|
|
|
private Long deptId;
|
|
|
|
private Long deptId;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -61,7 +64,7 @@ public class PaySalaryReportVo {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 员工id
|
|
|
|
* 员工id
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ExcelProperty(value = "员工id")
|
|
|
|
// @ExcelProperty(value = "员工id")
|
|
|
|
private Long employeeId;
|
|
|
|
private Long employeeId;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
|