diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderDayCountDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderDayCountDto.java index 38eda91..44b633a 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderDayCountDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderDayCountDto.java @@ -24,10 +24,15 @@ public class EbikeBikeOrderDayCountDto implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 工单类型名称:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 + */ + private String orderTypeName; + /** * 工单类型:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 */ - private String orderType; + private Integer orderType; /** * 处理人ID diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderMonthCountDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderMonthCountDto.java index dd9c63d..948d136 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderMonthCountDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderMonthCountDto.java @@ -24,10 +24,15 @@ public class EbikeBikeOrderMonthCountDto implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 工单类型名称:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 + */ + private String orderTypeName; + /** * 工单类型:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 */ - private String orderType; + private Integer orderType; /** * 处理人ID diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderWeekCountDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderWeekCountDto.java index 60f6649..4b405b7 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderWeekCountDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderWeekCountDto.java @@ -24,10 +24,15 @@ public class EbikeBikeOrderWeekCountDto implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 工单类型名称:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 + */ + private String orderTypeName; + /** * 工单类型:1 巡检工单 2 换电工单 3 调度工单 4 维修工单 */ - private String orderType; + private Integer orderType; /** * 处理人ID diff --git a/ebike-operations/src/main/resources/mapper/EbikeBikeOrderMapper.xml b/ebike-operations/src/main/resources/mapper/EbikeBikeOrderMapper.xml index 1e4a92e..8e345af 100644 --- a/ebike-operations/src/main/resources/mapper/EbikeBikeOrderMapper.xml +++ b/ebike-operations/src/main/resources/mapper/EbikeBikeOrderMapper.xml @@ -6,13 +6,13 @@ = wr.current_week_start AND ebo.handle_at < wr.current_week_end