diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs b/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs index 232ad8d..6372f72 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs +++ b/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs @@ -30,7 +30,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// [HttpGet("list")] - [ActionPermissionFilter(Permission = "business:devicerouteinspectionplan:list")] + [ActionPermissionFilter(Permission = "deviceManagement:devicerouteinspectionplan:list")] public IActionResult QueryDeviceRouteInspectionPlan([FromQuery] DeviceRouteInspectionPlanQueryDto parm) { var response = _DeviceRouteInspectionPlanService.GetList(parm); @@ -44,7 +44,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// [HttpGet("{Id}")] - [ActionPermissionFilter(Permission = "business:devicerouteinspectionplan:query")] + [ActionPermissionFilter(Permission = "deviceManagement:devicerouteinspectionplan:query")] public IActionResult GetDeviceRouteInspectionPlan(string Id) { var response = _DeviceRouteInspectionPlanService.GetInfo(Id); @@ -58,7 +58,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// [HttpPost] - [ActionPermissionFilter(Permission = "business:devicerouteinspectionplan:add")] + [ActionPermissionFilter(Permission = "deviceManagement:devicerouteinspectionplan:add")] [Log(Title = "巡检计划", BusinessType = BusinessType.INSERT)] public IActionResult AddDeviceRouteInspectionPlan([FromBody] DeviceRouteInspectionPlanDto parm) { @@ -74,7 +74,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// [HttpPut] - [ActionPermissionFilter(Permission = "business:devicerouteinspectionplan:edit")] + [ActionPermissionFilter(Permission = "deviceManagement:devicerouteinspectionplan:edit")] [Log(Title = "巡检计划", BusinessType = BusinessType.UPDATE)] public IActionResult UpdateDeviceRouteInspectionPlan([FromBody] DeviceRouteInspectionPlanDto parm) { @@ -89,7 +89,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// [HttpDelete("{ids}")] - [ActionPermissionFilter(Permission = "business:devicerouteinspectionplan:delete")] + [ActionPermissionFilter(Permission = "deviceManagement:devicerouteinspectionplan:delete")] [Log(Title = "巡检计划", BusinessType = BusinessType.DELETE)] public IActionResult DeleteDeviceRouteInspectionPlan(string ids) { diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-巡检计划-0527164632.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-巡检计划-0527164632.zip new file mode 100644 index 0000000..547e5a1 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-巡检计划-0527164632.zip differ diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg b/ZR.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg new file mode 100644 index 0000000..78ce767 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg differ diff --git a/ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs b/ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs index 87e57a0..ee60743 100644 --- a/ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs +++ b/ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs @@ -7,6 +7,11 @@ namespace ZR.Model.MES.dev.Dto /// public class DeviceRouteInspectionPlanQueryDto : PagerInfo { + public string Name { get; set; } + public DateTime? LifeCycleStart { get; set; } + + public DateTime? LifeCycleEnd { get; set; } + public int? Type { get; set; } } /// diff --git a/ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs b/ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs index 8520ab7..2825570 100644 --- a/ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs +++ b/ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs @@ -26,6 +26,11 @@ namespace ZR.Service.MES.dev { var predicate = Expressionable.Create(); + predicate.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name)) + .AndIF(parm.LifeCycleStart != null, it => it.LifeCycleStart >= parm.LifeCycleStart) + .AndIF(parm.LifeCycleEnd != null, it => it.LifeCycleEnd <= parm.LifeCycleEnd) + .AndIF(parm.Type != 0, it => it.Type == parm.Type); + var response = Queryable() .Where(predicate.ToExpression()) .ToPage(parm);