diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderPageDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderPageDto.java index 7be74f5..560397d 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderPageDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderPageDto.java @@ -111,9 +111,9 @@ public class EbikeBikeOrderPageDto implements Serializable { private String handleResult; /** - * 是否有效调度工单 + * 调度状态:0-工单已处理但暂不生效 1-生效 2-不生效 */ - private Boolean isValidDispatch; + private Integer dispatchState; /** * 创建人 diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java index 0f0243a..1ce8d1f 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java @@ -98,9 +98,9 @@ public class EbikeBikeOrder implements Serializable { private String handleResult; /** - * 是否有效调度工单 + * 调度状态:0-工单已处理但暂不生效 1-生效 2-不生效 */ - private Boolean isValidDispatch; + private Integer dispatchState; /** * 创建人 diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeBikeOrderVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeBikeOrderVo.java deleted file mode 100644 index 90fc43e..0000000 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeBikeOrderVo.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.cdzy.operations.model.vo; - -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * 工单信息。 - * - * @author attiya - * @since 2025-11-24 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class EbikeBikeOrderVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - - /** - * 车辆编号 - */ - @NotNull(message = "车辆编号不能为空") - private String bikeCode; - - /** - * 工单编号 - */ - private Long orderCode; - - /** - * 工单类型:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 - */ - private Integer orderType; - - /** - * 创建时间 - */ - private LocalDateTime createdAt; - - /** - * 更新时间 - */ - private LocalDateTime updatedAt; - - /** - * 删除状态(1已删除) - */ - private Boolean isDeleted; - - /** - * 删除时间 - */ - private LocalDateTime deletedAt; - - /** - * 处理人ID - */ - private Long receiverId; - - /** - * 处理状态 - */ - private Integer handleState; - - /** - * 处理时间 - */ - private LocalDateTime handleAt; - - /** - * 处理结果 - */ - private String handleResult; - - /** - * 是否有效调度工单 - */ - private Boolean isValidDispatch; - - /** - * 创建人 - */ - private Long createdBy; - -}