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

Compare commits

base: wyw:73559e18900dca80429439b6f1750b64e5e9d7cb
Branches Tags
wyw:master
..
compare: wyw:370976960b078955de97e9b62aa0639fd70b13fe
Branches Tags
wyw:master

No commits in common. "73559e18900dca80429439b6f1750b64e5e9d7cb" and "370976960b078955de97e9b62aa0639fd70b13fe" have entirely different histories.
73559e1890 ... 370976960b

1 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -142,12 +142,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
{ {
throw new Exception("通知人员不能为空"); throw new Exception("通知人员不能为空");
} }
if (entity.CLASS_ID == null)
{
throw new Exception("班次不能为空");
//entity.START_TIME = DateTime.Now;
//entity.END_TIME = entity.START_TIME.AddHours(24);
}
if (entity.DEPARTMENT_ID == null) if (entity.DEPARTMENT_ID == null)
{ {
var user = GetEntity<T_FM_USER>(t => t.ID == userID); var user = GetEntity<T_FM_USER>(t => t.ID == userID);
@ -325,6 +320,11 @@ 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);