From d830046c003880f050e35f3bb4a4b98cfe0c4260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Fri, 13 Mar 2026 10:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../convert/TaskStatControllerConvert.java         |  2 +-
 .../task/service/dto/TaskStatQueryServiceDTO.java  | 12 ++++++------
 .../ruoyi/task/service/impl/TaskServiceImpl.java   | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 9 deletions(-)

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 d0365ce..1ad3fe6 100644
--- a/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java
+++ b/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java
@@ -28,7 +28,7 @@ public class TaskStatControllerConvert {
         dto.setTaskCategory(apiDTO.getTaskCategory());
         dto.setTaskType(apiDTO.getTaskType());
         dto.setStatusList(apiDTO.getStatusList());
-        dto.setRouteId(apiDTO.getRouteId());
+        dto.setRouteIdList(apiDTO.getRouteIdList());
         dto.setUavId(apiDTO.getUavId());
         return dto;
     }
diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
index 58bd743..c5c4d3d 100644
--- a/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
+++ b/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
@@ -29,8 +29,8 @@ public class TaskStatQueryServiceDTO {
     /** 状态列表 */
     private List<StatusEnum> statusList;
 
-    /** 航线ID */
-    private Long routeId;
+    /** 航线ID列表 */
+    private List<Long> routeIdList;
 
     /** 无人机ID */
     private String uavId;
@@ -75,12 +75,12 @@ public class TaskStatQueryServiceDTO {
         this.statusList = statusList;
     }
 
-    public Long getRouteId() {
-        return routeId;
+    public List<Long> getRouteIdList() {
+        return routeIdList;
     }
 
-    public void setRouteId(Long routeId) {
-        this.routeId = routeId;
+    public void setRouteIdList(List<Long> routeIdList) {
+        this.routeIdList = routeIdList;
     }
 
     public String getUavId() {
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 6648759..cd270cc 100644
--- a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
@@ -193,7 +193,6 @@ public class TaskServiceImpl implements ITaskService {
     @Override
     public TaskStatByYearServiceDTO getTaskStatByYear(TaskStatQueryServiceDTO queryDTO) {
         Task task = new Task();
-        task.setRouteId(queryDTO.getRouteId());
         task.setUavId(queryDTO.getUavId());
         task.setTaskCategory(queryDTO.getTaskCategory());
         task.setTaskType(queryDTO.getTaskType());
@@ -212,6 +211,12 @@ public class TaskServiceImpl implements ITaskService {
                     continue;
                 }
 
+                // 如果指定了航线ID列表，则过滤航线
+                if (queryDTO.getRouteIdList() != null && !queryDTO.getRouteIdList().isEmpty()
+                    && !queryDTO.getRouteIdList().contains(t.getRouteId())) {
+                    continue;
+                }
+
                 calendar.setTime(t.getStartTime());
                 int year = calendar.get(Calendar.YEAR);
                 if (year == queryDTO.getYear()) {
@@ -231,7 +236,6 @@ public class TaskServiceImpl implements ITaskService {
     @Override
     public TaskStatByMonthServiceDTO getTaskStatByMonth(TaskStatQueryServiceDTO queryDTO) {
         Task task = new Task();
-        task.setRouteId(queryDTO.getRouteId());
         task.setUavId(queryDTO.getUavId());
         task.setTaskCategory(queryDTO.getTaskCategory());
         task.setTaskType(queryDTO.getTaskType());
@@ -250,6 +254,12 @@ public class TaskServiceImpl implements ITaskService {
                     continue;
                 }
 
+                // 如果指定了航线ID列表，则过滤航线
+                if (queryDTO.getRouteIdList() != null && !queryDTO.getRouteIdList().isEmpty()
+                    && !queryDTO.getRouteIdList().contains(t.getRouteId())) {
+                    continue;
+                }
+
                 calendar.setTime(t.getStartTime());
                 int year = calendar.get(Calendar.YEAR);
                 int month = calendar.get(Calendar.MONTH) + 1;