From 299964767b88cca862b7fcbd18815ab0323c0170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 6 Mar 2026 15:42:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=99=BE=E5=88=86=E6=AF=94=E8=BF=9B=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/vo/ProduceMonitorWorkPlanVO.java     | 24 +++++++++++++++++++
 .../service/impl/WorkOrderServiceImpl.java    |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java
index 899da51c..b6635a67 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorWorkPlanVO.java
@@ -67,4 +67,28 @@ public class ProduceMonitorWorkPlanVO {
 
 	@Schema(description = "实际结束时间")
 	private LocalDateTime factEndTime;
+
+	@Schema(description = "百分比")
+	private Double rate;
+
+	@Schema(description = "颜色")
+	private String workPlanColor;
+
+	public Double getRate() {
+		if (factEndTime != null) {
+			return 100d;
+		} else if (factStartTime != null) {
+			return 50d;
+		}
+		return 0d;
+	}
+
+	public String getWorkPlanColor() {
+		if (factEndTime != null) {
+			return "#00b7ee";
+		} else if (factStartTime != null) {
+			return "#22ac38";
+		}
+		return "#707070";
+	}
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 4f4bfa8f..32fb80fe 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -1143,6 +1143,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             if (workPlan.getPlanStartTime() != null && workPlan.getPlanEndTime() != null) {
                 workPlan.setHourActual(Duration.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime()).toMinutes());
             }
+            workPlan.setRate(workPlan.getRate());
+            workPlan.setWorkPlanColor(workPlan.getWorkPlanColor());
         }
         orderDataVO.setPlanList(workPlans);
         return orderDataVO;