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-07-27 12:11:31 +08:00
parent f391404d5a
commit a5eed05199
2 changed files with 110 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
View File

@ -1519,7 +1519,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
// } // }
// } // }
//} //}
var checkNotices = GetEntities<T_SK_SECURITY_INSPECTION_NOTICE>(e => e.APPLY_DEPARTMENT_ID.HasValue && e.CREATE_TIME.HasValue && e.CREATE_TIME.Value.Year == dtNow.Year && e.Nav_CheckType!=null && !e.Nav_CheckType.NAME.Contains("岗位排查"), newFilter); var checkNotices = GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.APPLY_DEPARTMENT_ID.HasValue && e.CREATE_TIME.HasValue && e.CREATE_TIME.Value.Year == dtNow.Year && e.Nav_CheckType!=null && !e.Nav_CheckType.NAME.Contains("岗位排查"), newFilter);
var checkIds = checkNotices.Select(t => t.CHECK_TYPE_ID).Distinct().ToList(); var checkIds = checkNotices.Select(t => t.CHECK_TYPE_ID).Distinct().ToList();
//var loginDepart = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID); //var loginDepart = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID);
var listCheckType = GetEntities<MS.Domain.Entities.SK.T_SK_CHECK_TYPE>(e => checkIds.Contains(e.ID), null, "Nav_ProductionUnit").OrderBy(t => t.PRODUCTION_UNIT_ID).ToList(); var listCheckType = GetEntities<MS.Domain.Entities.SK.T_SK_CHECK_TYPE>(e => checkIds.Contains(e.ID), null, "Nav_ProductionUnit").OrderBy(t => t.PRODUCTION_UNIT_ID).ToList();
@ -2349,8 +2349,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
newFilter.IgnoreDataRule = true; newFilter.IgnoreDataRule = true;
var startTime = dtNow.AddMonths(-11); var startTime = dtNow.AddMonths(-11);
var checkNotices = GetEntities<T_SK_SECURITY_INSPECTION_NOTICE>(e => e.APPLY_DEPARTMENT_ID.HasValue && e.CREATE_TIME.HasValue && e.CREATE_TIME >= startTime && e.Nav_CheckType!=null && !e.Nav_CheckType.NAME.Contains("岗位排查"), newFilter); var checkNotices = GetEntities<T_SK_SECURITY_INSPECTION_NOTICE>(e => e.APPLY_DEPARTMENT_ID.HasValue && e.CREATE_TIME.HasValue && e.CREATE_TIME >= startTime && e.Nav_CheckType!=null && !e.Nav_CheckType.NAME.Contains("岗位排查"), newFilter);
var noticeIds = checkNotices.Select(t => t.ID).ToList(); //var noticeIds = checkNotices.Select(t => t.ID).ToList();
var checkRecords = GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID.HasValue && noticeIds.Contains((Guid)e.SECURITY_INSPECTION_NOTICE_ID), newFilter); //var checkRecords = GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID.HasValue && noticeIds.Contains((Guid)e.SECURITY_INSPECTION_NOTICE_ID), newFilter);
var checkRecords = GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.APPLY_DEPARTMENT_ID.HasValue && e.CREATE_TIME.HasValue && e.CREATE_TIME >= startTime && e.Nav_CheckType != null && !e.Nav_CheckType.NAME.Contains("岗位排查"), newFilter);
var currentTime = Convert.ToDateTime(startTime.Year + "-" + startTime.Month + "-01 00:00:00"); var currentTime = Convert.ToDateTime(startTime.Year + "-" + startTime.Month + "-01 00:00:00");
List<HomeSafeCheckCountMonth> ListSafeCheckYearMonth = new List<HomeSafeCheckCountMonth>(); List<HomeSafeCheckCountMonth> ListSafeCheckYearMonth = new List<HomeSafeCheckCountMonth>();
//int befoMonth = 11;//计算 12 个月 就是提前 11个月 //int befoMonth = 11;//计算 12 个月 就是提前 11个月
@ -2427,7 +2428,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{ {
monthEnd = dtNow; monthEnd = dtNow;
} }
var listPerChearch = checkNotices.Where(t => t.CREATE_TIME >= monthStart && t.CREATE_TIME <= monthEnd); var listPerChearch = checkRecords.Where(t => t.CREATE_TIME >= monthStart && t.CREATE_TIME <= monthEnd);
HomeSafeCheckCountMonth modelper = new HomeSafeCheckCountMonth(); HomeSafeCheckCountMonth modelper = new HomeSafeCheckCountMonth();
modelper.Total = listPerChearch.Count(); modelper.Total = listPerChearch.Count();
modelper.listSOURCENAME = listCheckTypeNAME; modelper.listSOURCENAME = listCheckTypeNAME;

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

@ -8983,25 +8983,32 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
#endregion #endregion
[HttpPost, Route("GetTotalCount")] [HttpPost, Route("GetTotalCount")]
public JsonActionResult<dynamic> GetTotalCount([FromBody] KeywordPageFilter pageFilter) public JsonActionResult<dynamic> GetTotalCount([FromBody] KeywordFilter filter)
{ {
return SafeExecute<dynamic>(() => return SafeExecute<dynamic>(() =>
{ {
var newFilter = new KeywordFilter(); filter.IgnoreDataRule = true;
newFilter.OrgId = pageFilter.OrgId; var startTime = DateTime.Now; var endTime = DateTime.Now;
newFilter.IgnoreDataRule = true; if (!string.IsNullOrEmpty(filter.Parameter2))
{
startTime = Convert.ToDateTime(filter.Parameter2);
}
if (!string.IsNullOrEmpty(filter.Parameter3))
{
endTime = Convert.ToDateTime(filter.Parameter3);
}
//首页待办增加数量统计字段 //首页待办增加数量统计字段
dynamic ret = new System.Dynamic.ExpandoObject(); dynamic ret = new System.Dynamic.ExpandoObject();
var ordinaryCount = GetCount<T_FO_JOB_EVENT_RECORD>(s => !s.IS_DELETED, newFilter); var ordinaryCount = GetCount<T_FO_JOB_EVENT_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME>= startTime && s.CREATE_TIME<= endTime, filter);
var crucialCount = GetCount<T_FO_CRUCIAL_LICENSE_JOB>(s => !s.IS_DELETED, newFilter); var crucialCount = GetCount<T_FO_JOB_ACTIVITY_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED, newFilter); var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED, newFilter); var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED, newFilter); var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED, newFilter); var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED, newFilter); var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, newFilter); var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, filter);
var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, newFilter); var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, filter);
var postFinishCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, newFilter); var postFinishCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, filter);
ret.ordinaryCount = ordinaryCount; ret.ordinaryCount = ordinaryCount;
ret.crucialCount = crucialCount; ret.crucialCount = crucialCount;
ret.activityCount = activityCount; ret.activityCount = activityCount;
@ -9091,7 +9098,16 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
List<T_FM_RISK_LEVEL_PROPORTION> completionSorts = new List<T_FM_RISK_LEVEL_PROPORTION>(); List<T_FM_RISK_LEVEL_PROPORTION> completionSorts = new List<T_FM_RISK_LEVEL_PROPORTION>();
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var completions = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => !t.IS_DELETED, filter); var startTime = DateTime.Now; var endTime = DateTime.Now;
if (!string.IsNullOrEmpty(filter.Parameter2))
{
startTime = Convert.ToDateTime(filter.Parameter2);
}
if (!string.IsNullOrEmpty(filter.Parameter3))
{
endTime = Convert.ToDateTime(filter.Parameter3);
}
var completions = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => !t.IS_DELETED && t.CREATE_TIME >= startTime && t.CREATE_TIME <= endTime, filter);
var countTj = completions.Where(t => t.AUDIT_LEVEL == (int)HMOperationTaskAuditEnum.特级审批).Count(); var countTj = completions.Where(t => t.AUDIT_LEVEL == (int)HMOperationTaskAuditEnum.特级审批).Count();
T_FM_RISK_LEVEL_PROPORTION levelTj = new T_FM_RISK_LEVEL_PROPORTION(); T_FM_RISK_LEVEL_PROPORTION levelTj = new T_FM_RISK_LEVEL_PROPORTION();
levelTj.RISK_LEVEL = "特级审批"; levelTj.RISK_LEVEL = "特级审批";
@ -10062,13 +10078,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
baseFilter.SelectField = new string[] { "ID", "DEPARTMENT_ID" }; baseFilter.SelectField = new string[] { "ID", "DEPARTMENT_ID" };
var teams = GetEntities<T_FM_TEAM>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0, baseFilter); var teams = GetEntities<T_FM_TEAM>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0, baseFilter);
baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Team.NAME", "PRE_MEETING_STATUS", "DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_User.DEPARTMENT_ID" }; //指定字段，包括导航属性 baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Team.NAME", "PRE_MEETING_STATUS", "DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_User.DEPARTMENT_ID" }; //指定字段，包括导航属性
var preShiftMeetingTemp = GetEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList(); var preShiftMeetingTemp = GetEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(i => i.CREATE_TIME >= startTime && i.CREATE_TIME<= endTime && i.IS_DELETED == false, baseFilter).ToList();
//baseFilter.SelectField = new string[] { "CLASS_TEAM_ID", "Nav_Team.NAME", "SHIFT_STATUS", "DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_Editor.DEPARTMENT_ID" }; //指定字段，包括导航属性 //baseFilter.SelectField = new string[] { "CLASS_TEAM_ID", "Nav_Team.NAME", "SHIFT_STATUS", "DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_Editor.DEPARTMENT_ID" }; //指定字段，包括导航属性
//var currentShiftTemp = GetEntities<T_FO_CURRENT_CLASS_RECORD>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList(); //var currentShiftTemp = GetEntities<T_FO_CURRENT_CLASS_RECORD>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList();
//baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Team.NAME", "SHIFT_STATUS", "DEPARTMENT_ID", "OVERTIME", "CREATE_TIME" }; //指定字段，包括导航属性 //baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Team.NAME", "SHIFT_STATUS", "DEPARTMENT_ID", "OVERTIME", "CREATE_TIME" }; //指定字段，包括导航属性
//var changeShiftTemp = GetEntities<T_FO_CHANGE_SHIFT_RECORD>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList(); //var changeShiftTemp = GetEntities<T_FO_CHANGE_SHIFT_RECORD>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList();
baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Taem.NAME", "TA_STATUS", "Nav_Taem.DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_MainUser.DEPARTMENT_ID" }; //指定字段，包括导航属性 baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Taem.NAME", "TA_STATUS", "Nav_Taem.DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_MainUser.DEPARTMENT_ID" }; //指定字段，包括导航属性
var teamActivityTemp = GetEntities<T_FO_TEAM_ACTIVITY>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList(); var teamActivityTemp = GetEntities<T_FO_TEAM_ACTIVITY>(i => i.CREATE_TIME >= startTime && i.CREATE_TIME <= endTime && i.IS_DELETED == false, baseFilter).ToList();
for (DateTime i = startTime; i <= endTime; i = i.AddMonths(i.Month - i.Month + 1).AddDays(1 - i.Day)) for (DateTime i = startTime; i <= endTime; i = i.AddMonths(i.Month - i.Month + 1).AddDays(1 - i.Day))
{ {
var monthEnd = Convert.ToDateTime(i.AddMonths(i.Month - i.Month + 1).AddDays(1 - i.Day - 1).ToString().Replace("0:00:00", "23:59:59")); var monthEnd = Convert.ToDateTime(i.AddMonths(i.Month - i.Month + 1).AddDays(1 - i.Day - 1).ToString().Replace("0:00:00", "23:59:59"));
@ -12683,6 +12699,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
foreach (var item in teamIds) foreach (var item in teamIds)
{ {
var first = departments.FirstOrDefault(t => t.ID == item); var first = departments.FirstOrDefault(t => t.ID == item);
if (first != null)
{
var biSafeFinish = new T_BI_SAFETASK_FINISH(); var biSafeFinish = new T_BI_SAFETASK_FINISH();
biSafeFinish.ORG_ID = filter.OrgId.Value; biSafeFinish.ORG_ID = filter.OrgId.Value;
biSafeFinish.TEAM_ID = item; biSafeFinish.TEAM_ID = item;
@ -12719,6 +12737,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
biSafeFinish.FO03_OVERTIME = allInfos.Count(t => t.TEAM_ID == item && t.FORM_NAME == "岗位交接班" && t.FORM_STATUS == "归档" && t.OVERTIME == FOISOVERTIME.超时); biSafeFinish.FO03_OVERTIME = allInfos.Count(t => t.TEAM_ID == item && t.FORM_NAME == "岗位交接班" && t.FORM_STATUS == "归档" && t.OVERTIME == FOISOVERTIME.超时);
completions.Add(biSafeFinish); completions.Add(biSafeFinish);
} }
}
} }
completions = completions.OrderBy(t => t.DEPARTMENT_NAME).ThenBy(m => m.TEAM_NAME).ToList(); completions = completions.OrderBy(t => t.DEPARTMENT_NAME).ThenBy(m => m.TEAM_NAME).ToList();
return completions; return completions;
@ -12744,9 +12764,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var changeShiftTemp = GetEntities<T_FO_CHANGE_SHIFT_RECORD>(i => i.CREATE_TIME >= startTime && i.CREATE_TIME <= endTime && i.IS_DELETED == false, baseFilter).ToList(); var changeShiftTemp = GetEntities<T_FO_CHANGE_SHIFT_RECORD>(i => i.CREATE_TIME >= startTime && i.CREATE_TIME <= endTime && i.IS_DELETED == false, baseFilter).ToList();
//baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Taem.NAME", "TA_STATUS", "Nav_Taem.DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_MainUser.DEPARTMENT_ID" }; //指定字段，包括导航属性 //baseFilter.SelectField = new string[] { "TEAM_ID", "Nav_Taem.NAME", "TA_STATUS", "Nav_Taem.DEPARTMENT_ID", "OVERTIME", "CREATE_TIME", "Nav_MainUser.DEPARTMENT_ID" }; //指定字段，包括导航属性
//var teamActivityTemp = GetEntities<T_FO_TEAM_ACTIVITY>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList(); //var teamActivityTemp = GetEntities<T_FO_TEAM_ACTIVITY>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false, baseFilter).ToList();
var sourceIds = preShiftMeetingTemp.Select(t => t.ID).ToList();
var curIds = currentShiftTemp.Select(t => t.ID).ToList();
sourceIds.AddRange(curIds);
var changeIds = changeShiftTemp.Select(t => t.ID).ToList();
sourceIds.AddRange(changeIds);
baseFilter.SelectField = new string[] { "SOURCE_DATA_ID" }; baseFilter.SelectField = new string[] { "SOURCE_DATA_ID" };
var allnoticeTask = GetEntities<T_FM_NOTIFICATION_TASK>(t => t.NOTICE_STATUS == 2 && t.CREATE_TIME >= startTime && t.CREATE_TIME <= endTime, baseFilter); var allnoticeTask = GetEntities<T_FM_NOTIFICATION_TASK>(t => t.NOTICE_STATUS == 2 && t.CREATE_TIME >= startTime && t.SOURCE_DATA_ID !=null&& sourceIds.Contains((Guid)t.SOURCE_DATA_ID), baseFilter);
foreach (var item in preShiftMeetingTemp) foreach (var item in preShiftMeetingTemp)
{ {
if (item.TEAM_ID == null) if (item.TEAM_ID == null)
@ -12756,10 +12780,17 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
else else
{ {
var deparId = teams.FirstOrDefault(t => t.ID == item.TEAM_ID)?.DEPARTMENT_ID; var deparId = teams.FirstOrDefault(t => t.ID == item.TEAM_ID)?.DEPARTMENT_ID;
if (deparId == null)
{
item.TEAM_ID = item.Nav_User?.DEPARTMENT_ID;
}
else
{
item.TEAM_ID = deparId; item.TEAM_ID = deparId;
} }
var isOver = allnoticeTask.Where(t => t.SOURCE_DATA_ID == item.ID); }
if (isOver.Any()) var isOver = allnoticeTask.FirstOrDefault(t => t.SOURCE_DATA_ID == item.ID);
if (isOver!=null)
{ {
item.OVERTIME = FOISOVERTIME.超时; item.OVERTIME = FOISOVERTIME.超时;
} }
@ -12774,11 +12805,6 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
biSafeFinish.OVERTIME = item.OVERTIME; biSafeFinish.OVERTIME = item.OVERTIME;
biSafeFinish.FORM_STATUS = item.PRE_MEETING_STATUS.GetDescription(); biSafeFinish.FORM_STATUS = item.PRE_MEETING_STATUS.GetDescription();
completions.Add(biSafeFinish); completions.Add(biSafeFinish);
//biSafeFinish.TEAM_CHARGE_USER = team.Nav_ChargePerson.NAME;
//biSafeFinish.FO01_TOTAL = fo01a.Count();
//biSafeFinish.FO01_FINISH = fo01a.Count(t => t.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档 && t.OVERTIME != FOISOVERTIME.超时);
//biSafeFinish.FO01_UNFINISH = fo01a.Count(t => t.PRE_MEETING_STATUS < FOPreMeetingStatusEnum.归档);
//biSafeFinish.FO01_OVERTIME = fo01a.Count(t => t.OVERTIME == FOISOVERTIME.超时);
} }
foreach (var item in currentShiftTemp) foreach (var item in currentShiftTemp)
{ {
@ -12789,10 +12815,18 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
else else
{ {
var deparId = teams.FirstOrDefault(t => t.ID == item.CLASS_TEAM_ID)?.DEPARTMENT_ID; var deparId = teams.FirstOrDefault(t => t.ID == item.CLASS_TEAM_ID)?.DEPARTMENT_ID;
if (deparId == null)
{
item.CLASS_TEAM_ID = item.Nav_Editor?.DEPARTMENT_ID;
}
else
{
item.CLASS_TEAM_ID = deparId; item.CLASS_TEAM_ID = deparId;
} }
var isOver = allnoticeTask.Where(t => t.SOURCE_DATA_ID == item.ID);
if (isOver.Any()) }
var isOver = allnoticeTask.FirstOrDefault(t => t.SOURCE_DATA_ID == item.ID);
if (isOver!=null)
{ {
item.OVERTIME = FOISOVERTIME.超时; item.OVERTIME = FOISOVERTIME.超时;
} }
@ -12817,10 +12851,17 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
else else
{ {
var deparId = teams.FirstOrDefault(t => t.ID == item.TEAM_ID)?.DEPARTMENT_ID; var deparId = teams.FirstOrDefault(t => t.ID == item.TEAM_ID)?.DEPARTMENT_ID;
if (deparId == null)
{
item.TEAM_ID = item.Nav_Editor?.DEPARTMENT_ID;
}
else
{
item.TEAM_ID = deparId; item.TEAM_ID = deparId;
} }
var isOver = allnoticeTask.Where(t => t.SOURCE_DATA_ID == item.ID); }
if (isOver.Any()) var isOver = allnoticeTask.FirstOrDefault(t => t.SOURCE_DATA_ID == item.ID);
if (isOver!=null)
{ {
item.OVERTIME = FOISOVERTIME.超时; item.OVERTIME = FOISOVERTIME.超时;
} }
@ -12828,7 +12869,6 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
item.OVERTIME = FOISOVERTIME.未超时; item.OVERTIME = FOISOVERTIME.未超时;
} }
var biSafeFinish = new T_BI_SAFETASK_FINISH(); var biSafeFinish = new T_BI_SAFETASK_FINISH();
biSafeFinish.ORG_ID = orgId; biSafeFinish.ORG_ID = orgId;
biSafeFinish.TEAM_ID = (Guid)item.TEAM_ID; biSafeFinish.TEAM_ID = (Guid)item.TEAM_ID;
@ -12837,7 +12877,6 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
biSafeFinish.FORM_STATUS = Enum.GetName(typeof(FOChangeShiftStatusEnum), item.SHIFT_STATUS); biSafeFinish.FORM_STATUS = Enum.GetName(typeof(FOChangeShiftStatusEnum), item.SHIFT_STATUS);
completions.Add(biSafeFinish); completions.Add(biSafeFinish);
} }
return completions; return completions;
} }
public class JobInfo public class JobInfo