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

Compare commits

base: wyw:1483b91663e681af0769314115dfd5ea3464617c
Branches Tags
wyw:master
..
compare: wyw:ad1e6041f72740dfc47f302661fc6c58202c7030
Branches Tags
wyw:master

No commits in common. "1483b91663e681af0769314115dfd5ea3464617c" and "ad1e6041f72740dfc47f302661fc6c58202c7030" have entirely different histories.
1483b91663 ... ad1e6041f7

2 changed files with 1 additions and 6 deletions
Show Stats 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 mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
var tempList = mineType.Split(",").ToList(); 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.启用,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.启用 && tempList.Contains(t.MineType.ToString()),new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" });
if (analyze!=null) if (analyze!=null)
{ {
main.AUDIT_LEVEL=analyze.AUDIT_LEVEL; main.AUDIT_LEVEL=analyze.AUDIT_LEVEL;

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

@ -316,11 +316,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye); 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; entity.Nav_User = null;
users.ForEach(t => t.Nav_User = null); users.ForEach(t => t.Nav_User = null);
users.ForEach(t => t.ORG_ID = entity.ORG_ID); users.ForEach(t => t.ORG_ID = entity.ORG_ID);