新增签到月份检索,加班时间折算,项目数据月份检索,

This commit is contained in:
2025-03-15 16:35:15 +08:00
parent b4b227395c
commit c0fe9c8885
10 changed files with 45 additions and 28 deletions

View File

@@ -29,6 +29,9 @@ public class LaborCostData extends BaseEntity {
// 小时计时长
private Double hourWorkTime;
// 加班时间
private Double overtime;
}

View File

@@ -6,13 +6,13 @@ import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 项目管理业务对象 sys_oa_project
@@ -162,4 +162,7 @@ public class SysOaProjectBo extends BaseEntity {
*/
private String color;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date date;
}

View File

@@ -82,4 +82,7 @@ public class SysOaAttendanceVo extends SysOaAttendance {
// 小时计单个工作时间
private Double hourWorkTimes;
private Double overTime;
}