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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-07-24 10:25:03 +08:00
commit efa80c6979
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8986,19 +8986,21 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
return SafeExecute<dynamic>(() => return SafeExecute<dynamic>(() =>
{ {
pageFilter.IgnoreDataRule = true; var newFilter = new KeywordFilter();
newFilter.OrgId = pageFilter.OrgId;
newFilter.IgnoreDataRule = true;
//首页待办增加数量统计字段 //首页待办增加数量统计字段
dynamic ret = new System.Dynamic.ExpandoObject(); dynamic ret = new System.Dynamic.ExpandoObject();
var ordinaryCount = GetCount<T_FO_JOB_EVENT_RECORD>(s => !s.IS_DELETED, pageFilter); var ordinaryCount = GetCount<T_FO_JOB_EVENT_RECORD>(s => !s.IS_DELETED, newFilter);
var crucialCount = GetCount<T_FO_CRUCIAL_LICENSE_JOB>(s => !s.IS_DELETED, pageFilter); var crucialCount = GetCount<T_FO_CRUCIAL_LICENSE_JOB>(s => !s.IS_DELETED, newFilter);
var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED, pageFilter); var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED, newFilter);
var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED, pageFilter); var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED, newFilter);
var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED, pageFilter); var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED, newFilter);
var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED, pageFilter); var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED, newFilter);
var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED, pageFilter); var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED, newFilter);
var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, pageFilter); var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档, newFilter);
var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, pageFilter); var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum.归档, newFilter);
var postFinishCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, pageFilter); var postFinishCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.SHIFT_STATUS == (int)FOShiftStatusEnum.归档, newFilter);
ret.ordinaryCount = ordinaryCount; ret.ordinaryCount = ordinaryCount;
ret.crucialCount = crucialCount; ret.crucialCount = crucialCount;
ret.activityCount = activityCount; ret.activityCount = activityCount;
@ -9716,7 +9718,10 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
return completionSorts; return completionSorts;
} }
else
{
completionSorts = new List<T_FM_DEPARTMENT_COMPLETION_SORT>();
}
#endregion #endregion
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value; var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
//var mineType = 30; //var mineType = 30;