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);