RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

巡检

Browse Source
This commit is contained in:
qianhao.xu 2024-05-28 13:04:08 +08:00
parent 192db4921c
commit 63a8bf690f
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs
View File

@ -30,7 +30,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[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
/// <param name="Id"></param>
/// <returns></returns>
[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
/// </summary>
/// <returns></returns>
[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
/// </summary>
/// <returns></returns>
[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
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:devicerouteinspectionplan:delete")]
[ActionPermissionFilter(Permission = "deviceManagement:devicerouteinspectionplan:delete")]
[Log(Title = "巡检计划", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteDeviceRouteInspectionPlan(string ids)
{

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-巡检计划-0527164632.zip Normal file
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

5
ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs
View File

@ -7,6 +7,11 @@ namespace ZR.Model.MES.dev.Dto
/// </summary>
public class DeviceRouteInspectionPlanQueryDto : PagerInfo
{
public string Name { get; set; }
public DateTime? LifeCycleStart { get; set; }
public DateTime? LifeCycleEnd { get; set; }
public int? Type { get; set; }
}
/// <summary>

5
ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs
View File

@ -26,6 +26,11 @@ namespace ZR.Service.MES.dev
{
var predicate = Expressionable.Create<DeviceRouteInspectionPlan>();
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<DeviceRouteInspectionPlan, DeviceRouteInspectionPlanDto>(parm);