diff --git a/src/main/java/com/ruoyi/task/controller/TaskController.java b/src/main/java/com/ruoyi/task/controller/TaskController.java index bb326e1..d29fa36 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskController.java @@ -3,10 +3,10 @@ package com.ruoyi.task.controller; import com.alibaba.fastjson.JSON; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.task.api.domain.TaskStatByMonthVO; import com.ruoyi.task.api.domain.TaskStatQueryVO; import com.ruoyi.task.api.enums.TaskCategoryEnum; import com.ruoyi.task.api.enums.TaskTypeEnum; -import com.ruoyi.task.service.dto.TaskQueryDTO; import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.service.api.ITaskService; import com.ruoyi.task.controller.convert.TaskControllerConvert; @@ -126,7 +126,7 @@ public class TaskController extends BaseController * 按年月统计任务 */ @PostMapping("/stat/month") - public R getTaskStatByMonth(@RequestBody TaskStatQueryVO queryDTO) + public R getTaskStatByMonth(@RequestBody TaskStatQueryVO queryDTO) { return R.ok(TaskStatControllerConvert.fromMonth(taskService.getTaskStatByMonth(TaskStatControllerConvert.toQuery(queryDTO)))); } diff --git a/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java b/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java index 705572b..7b4535f 100644 --- a/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java +++ b/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java @@ -1,7 +1,8 @@ package com.ruoyi.task.controller.convert; +import com.ruoyi.task.api.domain.TaskStatByMonthVO; import com.ruoyi.task.api.domain.TaskStatQueryVO; -import com.ruoyi.task.api.domain.TaskStatItemDTO; +import com.ruoyi.task.api.domain.TaskStatItemVO; import com.ruoyi.task.service.dto.TaskStatItemServiceDTO; import java.util.ArrayList; @@ -49,15 +50,15 @@ public class TaskStatControllerConvert { /** * 服务按月统计DTO 转 API 按月统计DTO */ - public static com.ruoyi.task.api.domain.TaskStatByMonthDTO fromMonth(com.ruoyi.task.service.dto.TaskStatByMonthServiceDTO dto) { + public static TaskStatByMonthVO fromMonth(com.ruoyi.task.service.dto.TaskStatByMonthServiceDTO dto) { if (dto == null) return null; - com.ruoyi.task.api.domain.TaskStatByMonthDTO apiDTO = new com.ruoyi.task.api.domain.TaskStatByMonthDTO(); + TaskStatByMonthVO apiDTO = new TaskStatByMonthVO(); apiDTO.setTotal(dto.getTotal()); if (dto.getDays() != null) { - Map> apiDays = new HashMap<>(); + Map> apiDays = new HashMap<>(); for (Map.Entry> entry : dto.getDays().entrySet()) { - List apiItems = new ArrayList<>(); + List apiItems = new ArrayList<>(); for (TaskStatItemServiceDTO item : entry.getValue()) { apiItems.add(fromItem(item)); } @@ -69,9 +70,9 @@ public class TaskStatControllerConvert { return apiDTO; } - private static TaskStatItemDTO fromItem(TaskStatItemServiceDTO dto) { + private static TaskStatItemVO fromItem(TaskStatItemServiceDTO dto) { if (dto == null) return null; - TaskStatItemDTO apiDTO = new TaskStatItemDTO(); + TaskStatItemVO apiDTO = new TaskStatItemVO(); apiDTO.setTaskId(dto.getTaskId()); apiDTO.setPlanId(dto.getPlanId()); apiDTO.setTaskName(dto.getTaskName()); @@ -86,6 +87,8 @@ public class TaskStatControllerConvert { apiDTO.setActualStartTime(dto.getActualStartTime()); apiDTO.setActualEndTime(dto.getActualEndTime()); apiDTO.setStatus(dto.getStatus()); + apiDTO.setTaskType(dto.getTaskType()); + apiDTO.setTaskCategory(dto.getTaskCategory()); return apiDTO; } } diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskStatItemServiceDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskStatItemServiceDTO.java index 2df7e3e..4a12b40 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskStatItemServiceDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskStatItemServiceDTO.java @@ -3,6 +3,8 @@ package com.ruoyi.task.service.dto; import com.ruoyi.task.api.enums.CycleTypeEnum; import com.ruoyi.task.api.enums.PlanTypeEnum; 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; /** @@ -38,6 +40,8 @@ public class TaskStatItemServiceDTO { private Date actualStartTime; private Date actualEndTime; private StatusEnum status; + private TaskTypeEnum taskType; + private TaskCategoryEnum taskCategory; public Long getTaskId() { return taskId; @@ -158,4 +162,20 @@ public class TaskStatItemServiceDTO { 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; + } } diff --git a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java index 11f19dd..8440610 100644 --- a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java @@ -314,6 +314,8 @@ public class TaskServiceImpl implements ITaskService { item.setTaskId(t.getId()); item.setPlanId(t.getPlanId()); item.setTaskName(t.getTaskName()); + item.setTaskType(t.getTaskType()); + item.setTaskCategory(t.getTaskCategory()); item.setStartTime(t.getStartTime()); item.setEndTime(t.getEndTime()); item.setActualStartTime(t.getActualStartTime());