diff --git a/DOAN.Admin.WebApi/Controllers/PBL/BigScreenController.cs b/DOAN.Admin.WebApi/Controllers/PBL/BigScreenController.cs new file mode 100644 index 0000000..5c47e34 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/PBL/BigScreenController.cs @@ -0,0 +1,15 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.PBL.Dto; +using DOAN.Model.PBL; +using DOAN.Service.PBL.IService; +using DOAN.Admin.WebApi.Filters; + +namespace DOAN.Admin.WebApi.Controllers.PBL; + +[Verify] +[Route("PBL/bigscreen")] +public class BigScreenController : BaseController +{ + + +} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs b/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs index 3ec948c..f5cf854 100644 --- a/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs +++ b/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs @@ -36,9 +36,6 @@ namespace DOAN.Admin.WebApi.Controllers.PBL { parm.TimeRange[0]= DOANConvertDateTime.ConvertLocalDateTime(parm.TimeRange[0]??DateTime.MinValue); parm.TimeRange[1]= DOANConvertDateTime.ConvertLocalDateTime(parm.TimeRange[1]??DateTime.MinValue); - - - var response = _MesInterationLogService.GetList(parm); return SUCCESS(response); } diff --git a/DOAN.Service/PBL/MesInterationLogService.cs b/DOAN.Service/PBL/MesInterationLogService.cs index 7112b01..e5286b6 100644 --- a/DOAN.Service/PBL/MesInterationLogService.cs +++ b/DOAN.Service/PBL/MesInterationLogService.cs @@ -73,7 +73,7 @@ namespace DOAN.Service.PBL private static Expressionable QueryExp(MesInterationLogQueryDto parm) { var predicate = Expressionable.Create() - .AndIF(string.IsNullOrEmpty(parm.Workorder),it=>it.Workorder.Contains(parm.Workorder)) + .AndIF(!string.IsNullOrEmpty(parm.Workorder),it=>it.Workorder.Contains(parm.Workorder)) .AndIF(parm.TimeRange[0]>DateTime.MinValue, it => it.CreatedTime >=parm.TimeRange[0]) .AndIF(parm.TimeRange[1]>DateTime.MinValue, it => it.CreatedTime <=parm.TimeRange[1]) ;