wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
何美荣 2025-11-26 11:55:06 +08:00
parent 7aab9367ce
commit 887c75c619
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -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_HM_OPERATION_LINK>(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_HM_OPERATION_LINK>(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;

5
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

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