From 887c75c6197e98abee70f304d1e982e21719da7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 26 Nov 2025 11:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs | 2 +- .../Controllers/PreShiftMeetingRecordController.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index f333013..2ff30d2 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -659,7 +659,7 @@ namespace APT.FO.WebApi.Controllers { var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType; var tempList = mineType.Split(",").ToList(); - var analyze = GetEntity(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString()),new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" }); + var analyze = GetEntity(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用,new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" }); if (analyze!=null) { main.AUDIT_LEVEL=analyze.AUDIT_LEVEL; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 8b382ae..74f99b8 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -316,6 +316,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye); } } + if (entity.CLASS_ID == null) + { + entity.START_TIME = DateTime.Now; + entity.END_TIME = entity.START_TIME.AddHours(24); + } entity.Nav_User = null; users.ForEach(t => t.Nav_User = null); users.ForEach(t => t.ORG_ID = entity.ORG_ID);