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
///
[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();
-
- 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
{
///
/// 查询字符串
@@ -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; }
}
///
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
{
+ PagedInfo 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, ISysTasksQzService
{
+ ///
+ /// 查询任务
+ ///
+ ///
+ ///
+ public PagedInfo SelectTaskList(TasksQueryDto parm)
+ {
+ var predicate = Expressionable.Create();
+
+ 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);
+ }
+
///
/// 添加任务
///