From 6f55da80d19cba61bd23cd302b76bbb23038f7bd Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期二, 21 四月 2026 12:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/query/TaskPageListQuery.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/query/TaskPageListQuery.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/query/TaskPageListQuery.java
index 5e3ff5a..78fc423 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/query/TaskPageListQuery.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/query/TaskPageListQuery.java
@@ -14,24 +14,41 @@
     private String startTime;
     @ApiModelProperty(value = "派发类型为5 结束时间 yyyy-MM-dd HH:mm:ss")
     private String endTime;
-    @ApiModelProperty(value = "任务优先级 0=P0 1=P1 2=P2 3=P3 不传为全部")
-    private Integer taskUrgencyLevel;
-    @ApiModelProperty(value = "任务类别1常规 2事故")
-    private Integer taskCategory;
+
+
     @ApiModelProperty(value = "排序优先 1依据任务优先级 2车牌号 3任务时间")
     private Integer sortType;
     @ApiModelProperty(value = "排序规则 1正序 2倒序")
     private Integer sortRule;
-    @ApiModelProperty(value = "状态0=待到达 1=待处理 2=已完成 3=已取消")
+    @ApiModelProperty(value = "状态0=待到达 1=待处理 2=已完成 3=已取消  4=改派中")
     private Integer status;
     @ApiModelProperty(value = "当前登陆人id")
     private Long userId;
-    @ApiModelProperty(value = "车牌号")
-    private String plateNumber;
+
 
     @ApiModelProperty(value = "当前位置经度")
     private Double longitude;
 
     @ApiModelProperty(value = "当前位置纬度")
     private Double latitude;
+
+
+    @ApiModelProperty(value = "任务类别1常规 2事故")
+    private Integer taskCategory;
+
+    @ApiModelProperty(value = "事故类型")
+    private Long accidentTypeId;
+
+    @ApiModelProperty(value = "任务类型")
+    private Long taskTypeId;
+
+    @ApiModelProperty(value = "任务优先级 0=P0 1=P1 2=P2 3=P3 不传为全部")
+    private Integer taskUrgencyLevel;
+
+    @ApiModelProperty(value = "车牌号")
+    private String plateNumber;
+
+    @ApiModelProperty(value = "改派状态")
+    private String reassignmentStatus;
+
 }

--
Gitblit v1.7.1