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-29 15:54:50 +08:00
parent aedcba05bb
commit 5cde1c6e98
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -73,8 +73,10 @@ namespace APT.FO.WebApi.Controllers
{ {
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
entity.APPLY_USER_ID = loginUserId; if(entity.APPLY_USER_ID == null)
entity.APPLY_DEPARTMENT_ID = departmentId; entity.APPLY_USER_ID = loginUserId;
if(entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departmentId;
if (entity.COMPANY_ID == null) if (entity.COMPANY_ID == null)
{ {
entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID; entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID;
@ -285,6 +287,7 @@ namespace APT.FO.WebApi.Controllers
monitorFileList.Add(item); monitorFileList.Add(item);
} }
} }
T_FM_NOTIFICATION_TASK task = null;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>(); List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
@ -421,12 +424,12 @@ namespace APT.FO.WebApi.Controllers
}, null, null, null, null, null, "FO043_SHOWPRINT", null,null, FMTASKTYPE.JobSite); }, null, null, null, null, null, "FO043_SHOWPRINT", null,null, FMTASKTYPE.JobSite);
return true; return true;
} }
}
T_FM_NOTIFICATION_TASK task = null; if (entity.TaskID != Guid.Empty)
if (entity.TaskID != Guid.Empty) {
{ task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); task.SOURCE_FORMCODE = "FO043_SHOWPRINT";
task.SOURCE_FORMCODE = "FO043_SHOWPRINT"; }
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {