From de1768d59dc3a47cfa860c7553a5686252a3eb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 6 Jul 2023 21:54:57 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/TasksController.cs     | 15 ++---------
 ZR.Model/System/Dto/TasksDto.cs               |  3 ++-
 .../System/IService/ISysTasksQzService.cs     |  4 ++-
 ZR.Service/System/SysTasksQzService.cs        | 27 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
index d209168..67a5752 100644
--- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
@@ -8,7 +8,6 @@ using Quartz;
 using SqlSugar;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
-using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
 using ZR.Service.System.IService;
@@ -40,19 +39,9 @@ namespace ZR.Admin.WebApi.Controllers
         /// <returns></returns>
         [HttpGet("list")]
         [ActionPermissionFilter(Permission = "monitor:job:list")]
-        public IActionResult ListTask([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager)
+        public IActionResult ListTask([FromQuery] TasksQueryDto parm)
         {
-            //开始拼装查询条件
-            var predicate = Expressionable.Create<SysTasks>();
-
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.QueryText),
-                m => m.Name.Contains(parm.QueryText) ||
-                m.JobGroup.Contains(parm.QueryText) ||
-                m.AssemblyName.Contains(parm.QueryText));
-            predicate.AndIF(parm.TaskType != null, m => m.TaskType == parm.TaskType);
-
-            var response = _tasksQzService.GetPages(predicate.ToExpression(), pager);
-
+            var response = _tasksQzService.SelectTaskList(parm);
             return SUCCESS(response, TIME_FORMAT_FULL);
         }
 
diff --git a/ZR.Model/System/Dto/TasksDto.cs b/ZR.Model/System/Dto/TasksDto.cs
index 67fea86..6da320b 100644
--- a/ZR.Model/System/Dto/TasksDto.cs
+++ b/ZR.Model/System/Dto/TasksDto.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace ZR.Model.System.Dto
 {
-    public class TasksQueryDto
+    public class TasksQueryDto : PagerInfo
     {
         /// <summary>
         /// 查询字符串
@@ -12,6 +12,7 @@ namespace ZR.Model.System.Dto
         public string QueryText { get; set; }
         public int? TaskType { get; set; }
         public int? TriggerType { get; set; }
+        public int? IsStart { get; set; }
     }
 
     /// <summary>
diff --git a/ZR.Service/System/IService/ISysTasksQzService.cs b/ZR.Service/System/IService/ISysTasksQzService.cs
index 3ba6690..959f757 100644
--- a/ZR.Service/System/IService/ISysTasksQzService.cs
+++ b/ZR.Service/System/IService/ISysTasksQzService.cs
@@ -1,10 +1,12 @@
-using ZR.Model.System;
+using ZR.Model;
+using ZR.Model.System;
 using ZR.Model.System.Dto;
 
 namespace ZR.Service.System.IService
 {
     public interface ISysTasksQzService : IBaseService<SysTasks>
     {
+        PagedInfo<SysTasks> SelectTaskList(TasksQueryDto parm);
         //SysTasksQz GetId(object id);
         int AddTasks(SysTasks parm);
         int UpdateTasks(SysTasks parm);
diff --git a/ZR.Service/System/SysTasksQzService.cs b/ZR.Service/System/SysTasksQzService.cs
index cb9c1c4..0d12a87 100644
--- a/ZR.Service/System/SysTasksQzService.cs
+++ b/ZR.Service/System/SysTasksQzService.cs
@@ -1,7 +1,12 @@
-using Infrastructure.Attribute;
+using Infrastructure;
+using Infrastructure.Attribute;
 using Infrastructure.Extensions;
+using SqlSugar;
 using System;
+using ZR.Model;
 using ZR.Model.System;
+using ZR.Model.System.Dto;
+using ZR.Repository;
 using ZR.Service.System.IService;
 
 namespace ZR.Service.System
@@ -12,6 +17,26 @@ namespace ZR.Service.System
     [AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)]
     public class SysTasksQzService : BaseService<SysTasks>, ISysTasksQzService
     {
+        /// <summary>
+        /// 查询任务
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<SysTasks> SelectTaskList(TasksQueryDto parm)
+        {
+            var predicate = Expressionable.Create<SysTasks>();
+
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.QueryText),
+                m => m.Name.Contains(parm.QueryText) ||
+                m.JobGroup.Contains(parm.QueryText) ||
+                m.AssemblyName.Contains(parm.QueryText));
+            predicate.AndIF(parm.TaskType != null, m => m.TaskType == parm.TaskType);
+            predicate.AndIF(parm.IsStart != null, m => m.IsStart == parm.IsStart);
+
+            return Queryable().Where(predicate.ToExpression())
+                .ToPage(parm);
+        }
+
         /// <summary>
         /// 添加任务
         /// </summary>