From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java
index ef3e2ec..ec4a754 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java
@@ -35,6 +35,9 @@
@TableId(value = "id", type = IdType.NONE)
private Long id;
+ @ApiModelProperty(value = "事故类型id")
+ private String errorTypeId;
+
@ApiModelProperty(value = "任务编号")
private String taskCode;
@@ -43,9 +46,6 @@
//1:车辆检查,2:车辆充电,3:车辆整备,4:整备洗车,5:车辆维修,6:车辆保养,7:车辆保险到期,8:车辆年检到期9:车辆运营资质到期
@ApiModelProperty(value = "任务类型id 任务类别为2时对应数据字典,多个逗号分割，为1的时候 枚举1车辆检查 2车辆充电 3车辆整备 4整备洗车 5车辆维修 6车辆保养 7车辆保险到期 8车辆年检到期 9车辆运营资质到期")
private String taskTypeId;
-
- @ApiModelProperty(value = "任务类型id 任务类别为2时对应数据字典,多个逗号分割，为1的时候 枚举1车辆检查 2车辆充电 3车辆整备 4整备洗车 5车辆维修 6车辆保养 7车辆保险到期 8车辆年检到期 9车辆运营资质到期")
- private String accidentTypeId;
@ApiModelProperty(value = "任务紧急程度 0=P0 1=P1 2=P2 3=P3")
private Integer taskUrgencyLevel;
@@ -102,10 +102,39 @@
@ApiModelProperty(value = "状态 2=已处理 1=改派中")
private Integer reassignmentStatus;
- @ApiModelProperty(value = "任务来源 1-运维APP 2-管理后台")
+ @ApiModelProperty(value = "任务来源 1-运维APP 2-管理后台 3-远程代驾")
private Integer taskSource;
- @ApiModelProperty(value = "申请改派的用户id")
+ @ApiModelProperty(value = "申请改派的用户")
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<Long> excluded;
+ private List<Reject> excluded;
+
+
+ public Reject reject(String msg) {
+ Reject reject = new Reject();
+ reject.setRejectTime(LocalDateTime.now().toString());
+ reject.setRejectUserId(handleUserId);
+ reject.setRejectReason(msg);
+ return reject;
+ }
+ @Data
+ public static class Reject {
+
+ @ApiModelProperty(value = "拒绝原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "拒绝时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String rejectTime;
+
+ @ApiModelProperty(value = "拒绝人id")
+ private String rejectUserId;
+
+ @ApiModelProperty(value = "拒绝人姓名")
+ private String rejectUserName;
+
+
+ @ApiModelProperty(value = "拒绝人角色名称")
+ private String rejectUserRoleName;
+ }
}
--
Gitblit v1.7.1