THENG
/
a-tuoheng-task
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改状态为列表

This commit is contained in:
孙小云 2026-03-13 09:16:36 +08:00
parent 757b7fe761
commit 0bafff1d97
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java
View File

@ -27,7 +27,7 @@ public class TaskStatControllerConvert {
dto.setMonth(apiDTO.getMonth()); dto.setMonth(apiDTO.getMonth());
dto.setTaskCategory(apiDTO.getTaskCategory()); dto.setTaskCategory(apiDTO.getTaskCategory());
dto.setTaskType(apiDTO.getTaskType()); dto.setTaskType(apiDTO.getTaskType());
dto.setStatus(apiDTO.getStatus()); dto.setStatusList(apiDTO.getStatusList());
dto.setRouteId(apiDTO.getRouteId()); dto.setRouteId(apiDTO.getRouteId());
dto.setUavId(apiDTO.getUavId()); dto.setUavId(apiDTO.getUavId());
return dto; return dto;

14
src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
View File

@ -4,6 +4,8 @@ import com.ruoyi.task.api.enums.StatusEnum;
import com.ruoyi.task.api.enums.TaskCategoryEnum; import com.ruoyi.task.api.enums.TaskCategoryEnum;
import com.ruoyi.task.api.enums.TaskTypeEnum; import com.ruoyi.task.api.enums.TaskTypeEnum;
import java.util.List;
/** /**
* 任务统计查询DTO * 任务统计查询DTO
* *
@ -24,8 +26,8 @@ public class TaskStatQueryServiceDTO {
/** 任务类型 */ /** 任务类型 */
private TaskTypeEnum taskType; private TaskTypeEnum taskType;
/** 状态 */ /** 状态列表 */
private StatusEnum status; private List<StatusEnum> statusList;
/** 航线ID */ /** 航线ID */
private Long routeId; private Long routeId;
@ -65,12 +67,12 @@ public class TaskStatQueryServiceDTO {
this.taskType = taskType; this.taskType = taskType;
} }
public StatusEnum getStatus() { public List<StatusEnum> getStatusList() {
return status; return statusList;
} }
public void setStatus(StatusEnum status) { public void setStatusList(List<StatusEnum> statusList) {
this.status = status; this.statusList = statusList;
} }
public Long getRouteId() { public Long getRouteId() {

14
src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
View File

@ -195,7 +195,6 @@ public class TaskServiceImpl implements ITaskService {
Task task = new Task(); Task task = new Task();
task.setRouteId(queryDTO.getRouteId()); task.setRouteId(queryDTO.getRouteId());
task.setUavId(queryDTO.getUavId()); task.setUavId(queryDTO.getUavId());
task.setStatus(queryDTO.getStatus());
task.setTaskCategory(queryDTO.getTaskCategory()); task.setTaskCategory(queryDTO.getTaskCategory());
task.setTaskType(queryDTO.getTaskType()); task.setTaskType(queryDTO.getTaskType());
@ -207,6 +206,12 @@ public class TaskServiceImpl implements ITaskService {
for (Task t : tasks) { for (Task t : tasks) {
if (t.getStartTime() != null) { if (t.getStartTime() != null) {
// 如果指定了状态列表，则过滤状态
if (queryDTO.getStatusList() != null && !queryDTO.getStatusList().isEmpty()
&& !queryDTO.getStatusList().contains(t.getStatus())) {
continue;
}
calendar.setTime(t.getStartTime()); calendar.setTime(t.getStartTime());
int year = calendar.get(Calendar.YEAR); int year = calendar.get(Calendar.YEAR);
if (year == queryDTO.getYear()) { if (year == queryDTO.getYear()) {
@ -228,7 +233,6 @@ public class TaskServiceImpl implements ITaskService {
Task task = new Task(); Task task = new Task();
task.setRouteId(queryDTO.getRouteId()); task.setRouteId(queryDTO.getRouteId());
task.setUavId(queryDTO.getUavId()); task.setUavId(queryDTO.getUavId());
task.setStatus(queryDTO.getStatus());
task.setTaskCategory(queryDTO.getTaskCategory()); task.setTaskCategory(queryDTO.getTaskCategory());
task.setTaskType(queryDTO.getTaskType()); task.setTaskType(queryDTO.getTaskType());
@ -240,6 +244,12 @@ public class TaskServiceImpl implements ITaskService {
for (Task t : tasks) { for (Task t : tasks) {
if (t.getStartTime() != null) { if (t.getStartTime() != null) {
// 如果指定了状态列表，则过滤状态
if (queryDTO.getStatusList() != null && !queryDTO.getStatusList().isEmpty()
&& !queryDTO.getStatusList().contains(t.getStatus())) {
continue;
}
calendar.setTime(t.getStartTime()); calendar.setTime(t.getStartTime());
int year = calendar.get(Calendar.YEAR); int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH) + 1; int month = calendar.get(Calendar.MONTH) + 1;