From 4e5f51a4c84c00a3e6f3271bedc6952650e2b1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com>
Date: Sat, 13 Jan 2024 16:44:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96job=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/Task/TaskGetOutput.cs                                 | 3 +++
 .../rbac/Yi.Framework.Rbac.Application/Services/TaskService.cs | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Task/TaskGetOutput.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Task/TaskGetOutput.cs
index ce885a72..c318da13 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Task/TaskGetOutput.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Task/TaskGetOutput.cs
@@ -80,5 +80,8 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Task
         /// 触发器类型
         /// </summary>
         public JobTypeEnum Type { get; set; }
+
+        public string? Cron { get; set; }
+        public double? Millisecond { get; set; }
     }
 }
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/TaskService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/TaskService.cs
index d119f0e0..b8f79698 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/TaskService.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/TaskService.cs
@@ -58,11 +58,13 @@ namespace Yi.Framework.Rbac.Application.Services
             {
                 output.TriggerArgs =Math.Round(simple.RepeatInterval.TotalMinutes,2) .ToString() + "分钟";
                 output.Type = JobTypeEnum.Millisecond;
+                output.Millisecond = simple.RepeatInterval.TotalMilliseconds;
             }
             else if (trigger is ICronTrigger cron)
             {
                 output.TriggerArgs = cron.CronExpressionString!;
                 output.Type = JobTypeEnum.Cron;
+                output.Cron=cron.CronExpressionString;
             }
             return output;
         }