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