diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthVO.java similarity index 68% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthVO.java index ce9b051..54109ce 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthVO.java @@ -9,13 +9,13 @@ import java.util.Map; * @author ruoyi * @date 2026-03-09 */ -public class TaskStatByMonthDTO { +public class TaskStatByMonthVO { /** 总数 */ private Integer total; /** 每日任务列表 key:日期(1-31) value:任务列表 */ - private Map> days; + private Map> days; public Integer getTotal() { return total; @@ -25,11 +25,11 @@ public class TaskStatByMonthDTO { this.total = total; } - public Map> getDays() { + public Map> getDays() { return days; } - public void setDays(Map> days) { + public void setDays(Map> days) { this.days = days; } } diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java similarity index 83% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java index 58d8a69..f28c34b 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java @@ -1,6 +1,8 @@ package com.ruoyi.task.api.domain; import com.ruoyi.task.api.enums.StatusEnum; +import com.ruoyi.task.api.enums.TaskCategoryEnum; +import com.ruoyi.task.api.enums.TaskTypeEnum; import java.util.Date; /** @@ -9,7 +11,7 @@ import java.util.Date; * @author ruoyi * @date 2026-03-09 */ -public class TaskStatItemDTO { +public class TaskStatItemVO { private Long taskId; private Long planId; @@ -25,6 +27,8 @@ public class TaskStatItemDTO { private Date actualStartTime; private Date actualEndTime; private StatusEnum status; + private TaskTypeEnum taskType; + private TaskCategoryEnum taskCategory; public Long getTaskId() { return taskId; @@ -137,4 +141,20 @@ public class TaskStatItemDTO { public void setStatus(StatusEnum status) { this.status = status; } + + public TaskTypeEnum getTaskType() { + return taskType; + } + + public void setTaskType(TaskTypeEnum taskType) { + this.taskType = taskType; + } + + public TaskCategoryEnum getTaskCategory() { + return taskCategory; + } + + public void setTaskCategory(TaskCategoryEnum taskCategory) { + this.taskCategory = taskCategory; + } }