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:
何美荣 2026-05-08 18:07:25 +08:00
parent 532b42625f
commit e583d55e02
2 changed files with 81 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
View File

@ -96,9 +96,27 @@ namespace APT.PP.WebApi.Controllers.Api.PP
shift.RUN_STATUS = true; shift.RUN_STATUS = true;
//查出当前班组 //查出当前班组
var currentTeam = shift.Nav_Team; var currentTeam = shift.Nav_Team;
Guid? userId = null;
var userName = "";
//班长删掉了去查休假表，有代理人发给代理人，没有代理人就不触发
var charge = shift.Nav_DepartmentSchedulingDetail.FirstOrDefault(t => t.PERSON_ID == currentTeam?.CHARGE_PERSON_ID);
if (charge == null)
{
var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID); var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID);
var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID; if (userAgent != null && userAgent.AGENT_ID != null)
var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME; {
userId = userAgent.AGENT_ID;
userName = userAgent.Nav_Agent?.NAME;
}
}
else
{
userId = currentTeam?.Nav_ChargePerson?.Nav_User?.ID;
userName = currentTeam?.Nav_ChargePerson?.Nav_User?.NAME;
}
//有排班或者有代理人才触发
if (userId != null)
{
//当前班组的人员 //当前班组的人员
var currentTeamUsers = shift.Nav_DepartmentSchedulingDetail; var currentTeamUsers = shift.Nav_DepartmentSchedulingDetail;
T_FO_PRE_SHIFT_MEETING_RECORD record = new T_FO_PRE_SHIFT_MEETING_RECORD(); ; T_FO_PRE_SHIFT_MEETING_RECORD record = new T_FO_PRE_SHIFT_MEETING_RECORD(); ;
@ -155,6 +173,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel(dt.Date.ToString("yyyyMMdd") + currentTeam.NAME + "-" + "班前会议", record.ID, filter.GetOrgId(), (Guid)userId, userName, startTime, endTime, (int)FMNoticeTypeEnum.消息, "FO003"); var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel(dt.Date.ToString("yyyyMMdd") + currentTeam.NAME + "-" + "班前会议", record.ID, filter.GetOrgId(), (Guid)userId, userName, startTime, endTime, (int)FMNoticeTypeEnum.消息, "FO003");
notices.Add(noticeTask); notices.Add(noticeTask);
} }
}
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (listRecord.Any()) if (listRecord.Any())

11
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
View File

@ -11239,8 +11239,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var taskGroup = listAddNew.GroupBy(t => new { t.COMPANY_NAME, t.MOULD_NAME, t.FORM_NAME }).ToList(); var taskGroup = listAddNew.GroupBy(t => new { t.COMPANY_NAME, t.MOULD_NAME, t.FORM_NAME }).ToList();
if (taskGroup != null && taskGroup.Any()) if (taskGroup != null && taskGroup.Any())
{ {
var forms = this.GetEntities<T_PF_FORM>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); //var forms = this.GetEntities<T_PF_FORM>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
var menus = this.GetEntities<T_PF_MENU>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); //var menus = this.GetEntities<T_PF_MENU>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
foreach (var item in taskGroup) foreach (var item in taskGroup)
{ {
var details = listAddNew.Where(t => t.COMPANY_NAME == item.Key.COMPANY_NAME && t.MOULD_NAME == item.Key.MOULD_NAME && t.FORM_NAME == item.Key.FORM_NAME).ToList(); var details = listAddNew.Where(t => t.COMPANY_NAME == item.Key.COMPANY_NAME && t.MOULD_NAME == item.Key.MOULD_NAME && t.FORM_NAME == item.Key.FORM_NAME).ToList();
@ -11261,8 +11261,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
info.details = new List<TaskViewInfoDetail>(); info.details = new List<TaskViewInfoDetail>();
foreach (var de in details) foreach (var de in details)
{ {
var formInfo = forms.FirstOrDefault(t=>t.NAME == de.FORM_NAME); //var formInfo = forms.FirstOrDefault(t=>t.NAME == de.FORM_NAME);
var menuInfo = menus.FirstOrDefault(t => t.FORM_ID == formInfo?.ID); //var menuInfo = menus.FirstOrDefault(t => t.FORM_ID == formInfo?.ID);
TaskViewInfoDetail dd = new TaskViewInfoDetail(); TaskViewInfoDetail dd = new TaskViewInfoDetail();
dd.COMPANY_NAME = de.COMPANY_NAME; dd.COMPANY_NAME = de.COMPANY_NAME;
dd.MOULD_NAME = de.MOULD_NAME; dd.MOULD_NAME = de.MOULD_NAME;
@ -11273,9 +11273,10 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
dd.TASK_STARTDT = de.TASK_STARTDT; dd.TASK_STARTDT = de.TASK_STARTDT;
dd.TASK_ENDDT = de.TASK_ENDDT; dd.TASK_ENDDT = de.TASK_ENDDT;
dd.USER_NAME = de.USER_NAME; dd.USER_NAME = de.USER_NAME;
dd.NUM = menuInfo?.NUM; //dd.NUM = menuInfo?.NUM;
info.details.Add(dd); info.details.Add(dd);
} }
info.details = info.details.OrderBy(t => t.NUM).ToList();
} }
result.Data.Add(info); result.Data.Add(info);
} }