Teams/sy_hx_pbl_backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
qianhao.xu
2024-11-01 15:44:37 +08:00
parent 397fc2da11
commit ced8e31bd4
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DOAN.Admin.WebApi/Controllers/PBL/BigScreenController.cs Normal file
View File

@@ -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
{
}

3
DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs
View File

@@ -36,9 +36,6 @@ namespace DOAN.Admin.WebApi.Controllers.PBL
{ {
parm.TimeRange[0]= DOANConvertDateTime.ConvertLocalDateTime(parm.TimeRange[0]??DateTime.MinValue); parm.TimeRange[0]= DOANConvertDateTime.ConvertLocalDateTime(parm.TimeRange[0]??DateTime.MinValue);
parm.TimeRange[1]= DOANConvertDateTime.ConvertLocalDateTime(parm.TimeRange[1]??DateTime.MinValue); parm.TimeRange[1]= DOANConvertDateTime.ConvertLocalDateTime(parm.TimeRange[1]??DateTime.MinValue);
var response = _MesInterationLogService.GetList(parm); var response = _MesInterationLogService.GetList(parm);
return SUCCESS(response); return SUCCESS(response);
} }

2
DOAN.Service/PBL/MesInterationLogService.cs
View File

@@ -73,7 +73,7 @@ namespace DOAN.Service.PBL
private static Expressionable<MesInterationLog> QueryExp(MesInterationLogQueryDto parm) private static Expressionable<MesInterationLog> QueryExp(MesInterationLogQueryDto parm)
{ {
var predicate = Expressionable.Create<MesInterationLog>() var predicate = Expressionable.Create<MesInterationLog>()
.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[0]>DateTime.MinValue, it => it.CreatedTime >=parm.TimeRange[0])
.AndIF(parm.TimeRange[1]>DateTime.MinValue, it => it.CreatedTime <=parm.TimeRange[1]) .AndIF(parm.TimeRange[1]>DateTime.MinValue, it => it.CreatedTime <=parm.TimeRange[1])
; ;