From ec32a83aae828c7fd76fbfd790c092f4498e49b1464dedd7b4db889bbad23dc8 Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Wed, 28 Jan 2026 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/dto/EbikeBikeOrderDayCountDto.java         |  7 ++++++-
 .../model/dto/EbikeBikeOrderMonthCountDto.java       |  7 ++++++-
 .../model/dto/EbikeBikeOrderWeekCountDto.java        |  7 ++++++-
 .../main/resources/mapper/EbikeBikeOrderMapper.xml   | 12 ++++++------
 4 files changed, 24 insertions(+), 9 deletions(-)

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 @@
 
     <select id="monthCount" resultType="com.cdzy.operations.model.dto.EbikeBikeOrderMonthCountDto">
         <![CDATA[
-        SELECT #{receiverId} as receiverId,
+        SELECT #{receiverId} as receiverId,aot.order_type AS orderType,
                CASE aot.order_type
                    WHEN 1 THEN '巡检工单'
                    WHEN 2 THEN '换电工单'
                    WHEN 3 THEN '调度工单'
                    WHEN 4 THEN '维修工单'
-                   END       as orderType,
+                   END       as orderTypeName,
                COALESCE(COUNT(CASE
                                   WHEN DATE_TRUNC('month', ebo.handle_at) = DATE_TRUNC('month', CURRENT_DATE)
                                       THEN 1
@@ -61,13 +61,13 @@
     </select>
     <select id="dayCount" resultType="com.cdzy.operations.model.dto.EbikeBikeOrderDayCountDto">
     <![CDATA[
-        SELECT #{receiverId}           as receiverId,
+        SELECT #{receiverId}           as receiverId,aot.order_type AS orderType,
                CASE aot.order_type
                    WHEN 1 THEN '巡检工单'
                    WHEN 2 THEN '换电工单'
                    WHEN 3 THEN '调度工单'
                    WHEN 4 THEN '维修工单'
-                   END                 as orderType,
+                   END                 as orderTypeName,
                COALESCE(COUNT(CASE
                                   WHEN DATE (ebo.handle_at) = CURRENT_DATE
                               THEN 1
@@ -119,13 +119,13 @@
         WITH week_range AS (SELECT DATE_TRUNC('week', CURRENT_DATE) as current_week_start,
                                    DATE_TRUNC('week', CURRENT_DATE) + INTERVAL '1 week' as current_week_end, DATE_TRUNC('week', CURRENT_DATE - INTERVAL '1 week') as last_week_start
             )
-        SELECT #{receiverId} as receiverId,
+        SELECT #{receiverId} as receiverId,aot.order_type AS orderType,
                CASE aot.order_type
                    WHEN 1 THEN '巡检工单'
                    WHEN 2 THEN '换电工单'
                    WHEN 3 THEN '调度工单'
                    WHEN 4 THEN '维修工单'
-                   END       as orderType,
+                   END       as orderTypeName,
                COALESCE(COUNT(CASE
                                   WHEN ebo.handle_at >= wr.current_week_start
                                       AND ebo.handle_at < wr.current_week_end