refactor(oa): 优化工资发放记录日期格式
- 在 GearSalaryRecords、GearSalaryRecordsBo 和 GearSalaryRecordsVo 类中添加 @DateTimeFormat 注解 - 统一发薪月份日期格式为 "yyyy-MM-dd HH:mm:ss" - 提高日期数据的可读性和一致性
This commit is contained in:
@@ -11,6 +11,7 @@ import java.math.BigDecimal;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.gear.common.core.domain.BaseEntity;
|
import com.gear.common.core.domain.BaseEntity;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工资发放记录对象 gear_salary_records
|
* 工资发放记录对象 gear_salary_records
|
||||||
@@ -37,6 +38,7 @@ public class GearSalaryRecords extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 发薪月份(YYYY-MM-01)
|
* 发薪月份(YYYY-MM-01)
|
||||||
*/
|
*/
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date payPeriod;
|
private Date payPeriod;
|
||||||
/**
|
/**
|
||||||
* 基本工资
|
* 基本工资
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import java.util.List;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.gear.common.core.domain.BaseEntity;
|
import com.gear.common.core.domain.BaseEntity;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工资发放记录业务对象 gear_salary_records
|
* 工资发放记录业务对象 gear_salary_records
|
||||||
@@ -39,6 +40,7 @@ public class GearSalaryRecordsBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 发薪月份(YYYY-MM-01)
|
* 发薪月份(YYYY-MM-01)
|
||||||
*/
|
*/
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date payPeriod;
|
private Date payPeriod;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
|
|||||||
import com.gear.common.annotation.ExcelDictFormat;
|
import com.gear.common.annotation.ExcelDictFormat;
|
||||||
import com.gear.common.convert.ExcelDictConvert;
|
import com.gear.common.convert.ExcelDictConvert;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
|
|
||||||
@@ -40,6 +42,7 @@ public class GearSalaryRecordsVo {
|
|||||||
* 发薪月份(YYYY-MM-01)
|
* 发薪月份(YYYY-MM-01)
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "发薪月份(YYYY-MM-01)")
|
@ExcelProperty(value = "发薪月份(YYYY-MM-01)")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date payPeriod;
|
private Date payPeriod;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user