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 7b4535f..238520c 100644 --- a/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java +++ b/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java @@ -89,6 +89,9 @@ public class TaskStatControllerConvert { apiDTO.setStatus(dto.getStatus()); apiDTO.setTaskType(dto.getTaskType()); apiDTO.setTaskCategory(dto.getTaskCategory()); + apiDTO.setAirlineType(dto.getAirlineType()); + apiDTO.setTaskCreateTime(dto.getTaskCreateTime()); + apiDTO.setTaskCreateBy(dto.getTaskCreateBy()); 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 4a12b40..0348743 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskStatItemServiceDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskStatItemServiceDTO.java @@ -42,6 +42,9 @@ public class TaskStatItemServiceDTO { private StatusEnum status; private TaskTypeEnum taskType; private TaskCategoryEnum taskCategory; + private String airlineType; + private Date taskCreateTime; + private String taskCreateBy; public Long getTaskId() { return taskId; @@ -178,4 +181,28 @@ public class TaskStatItemServiceDTO { public void setTaskCategory(TaskCategoryEnum taskCategory) { this.taskCategory = taskCategory; } + + public String getAirlineType() { + return airlineType; + } + + public void setAirlineType(String airlineType) { + this.airlineType = airlineType; + } + + public Date getTaskCreateTime() { + return taskCreateTime; + } + + public void setTaskCreateTime(Date taskCreateTime) { + this.taskCreateTime = taskCreateTime; + } + + public String getTaskCreateBy() { + return taskCreateBy; + } + + public void setTaskCreateBy(String taskCreateBy) { + this.taskCreateBy = taskCreateBy; + } } 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 8440610..4c7fd76 100644 --- a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java @@ -321,6 +321,8 @@ public class TaskServiceImpl implements ITaskService { item.setActualStartTime(t.getActualStartTime()); item.setActualEndTime(t.getActualEndTime()); item.setStatus(t.getStatus()); + item.setTaskCreateTime(t.getCreateTime()); + item.setTaskCreateBy(t.getCreateBy()); if (t.getPlanId() != null) { TaskPlan plan = taskPlanDomain.getTaskPlanById(t.getPlanId()); @@ -341,6 +343,7 @@ public class TaskServiceImpl implements ITaskService { item.setRouteName(airlineResult.getData().getName()); item.setAirVendor(airlineResult.getData().getAirVendor()); item.setAirType(airlineResult.getData().getAirType()); + item.setAirlineType(airlineResult.getData().getType()); } } catch (Exception e) { // 忽略远程调用异常