diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetDeptBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetDeptBo.java index af065c82..aa3e3857 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetDeptBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetDeptBo.java @@ -2,6 +2,9 @@ package org.dromara.oa.erp.domain.bo; import org.dromara.oa.erp.domain.ErpTimesheetDept; import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.math.BigDecimal; + import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; @@ -55,12 +58,11 @@ public class ErpTimesheetDeptBo extends BaseEntity { /** * 工时 */ - private Long hours; + private BigDecimal hours; /** * 指定审批人ID */ private Long approverId; - } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetProjectBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetProjectBo.java index 99792a70..df86e252 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetProjectBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetProjectBo.java @@ -2,6 +2,9 @@ package org.dromara.oa.erp.domain.bo; import org.dromara.oa.erp.domain.ErpTimesheetProject; import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.math.BigDecimal; + import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; @@ -65,12 +68,11 @@ public class ErpTimesheetProjectBo extends BaseEntity { /** * 工时 */ - private Long hours; + private BigDecimal hours; /** * 指定审批人ID */ private Long approverId; - } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetDeptVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetDeptVo.java index ce780739..ebaf2cd3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetDeptVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetDeptVo.java @@ -10,10 +10,9 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; - - /** * 部门工作明细视图对象 erp_timesheet_dept * @@ -68,12 +67,11 @@ public class ErpTimesheetDeptVo implements Serializable { * 工时 */ @ExcelProperty(value = "工时") - private Long hours; + private BigDecimal hours; /** * 指定审批人ID */ private Long approverId; - } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetProjectVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetProjectVo.java index cd5c0b98..18c1bf0e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetProjectVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetProjectVo.java @@ -10,10 +10,9 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; - - /** * 项目工作明细视图对象 erp_timesheet_project * @@ -80,12 +79,11 @@ public class ErpTimesheetProjectVo implements Serializable { * 工时 */ @ExcelProperty(value = "工时") - private Long hours; + private BigDecimal hours; /** * 指定审批人ID */ private Long approverId; - }