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-06-03 16:27:39 +08:00
parent a1f04c63f6
commit 4eb8c4307c
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
View File

@ -810,7 +810,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
List<T_FM_WORK_TICKET_COMPLETION> completions = new List<T_FM_WORK_TICKET_COMPLETION>(); List<T_FM_WORK_TICKET_COMPLETION> completions = new List<T_FM_WORK_TICKET_COMPLETION>();
var jobIds = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(i => true, new BaseFilter(filter.GetOrgId())).Select(t => t.ID).ToList(); var jobIds = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(i => true, new BaseFilter(filter.GetOrgId())).Select(t => t.ID).ToList();
var tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => jobIds.Contains((Guid)t.SOURCE_DATA_ID), new BaseFilter(filter.GetOrgId())) var fireJobIds = GetEntities<T_FO_FIRE_JOB>(i => true, new BaseFilter(filter.GetOrgId())).Select(t => t.ID).ToList();
var tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => fireJobIds.Contains((Guid)t.SOURCE_DATA_ID) || jobIds.Contains((Guid)t.SOURCE_DATA_ID), new BaseFilter(filter.GetOrgId()))
.Select(m => new { m.NOTICE_STATUS, m.USER_ID }).ToList(); .Select(m => new { m.NOTICE_STATUS, m.USER_ID }).ToList();
var userIds = tasks.Select(t => t.USER_ID).Distinct().ToList(); var userIds = tasks.Select(t => t.USER_ID).Distinct().ToList();
var user = this.GetEntities<T_FM_USER>(t => userIds.Contains(t.ID) && t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()), new string[] { "Nav_Department" }).Select(t => new { t.ID, t.DEPARTMENT_ID, t.Nav_Department.NAME }).ToList(); var user = this.GetEntities<T_FM_USER>(t => userIds.Contains(t.ID) && t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()), new string[] { "Nav_Department" }).Select(t => new { t.ID, t.DEPARTMENT_ID, t.Nav_Department.NAME }).ToList();
@ -893,6 +894,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
baseFilter.SelectField = new string[] { "ID", "IS_PUBLISH", "DEPARTMENT_ID", "CREATE_TIME", "IS_OVERTIME" }; //指定字段，包括导航属性 baseFilter.SelectField = new string[] { "ID", "IS_PUBLISH", "DEPARTMENT_ID", "CREATE_TIME", "IS_OVERTIME" }; //指定字段，包括导航属性
var jobInfos = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false && i.DEPARTMENT_ID != null, baseFilter).ToList(); var jobInfos = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false && i.DEPARTMENT_ID != null, baseFilter).ToList();
var jobIds = jobInfos.Select(t => t.ID).ToList(); var jobIds = jobInfos.Select(t => t.ID).ToList();
//baseFilter.SelectField = new string[] { "ID", "STATUS", "APPLY_DEPARTMENT_ID", "CREATE_TIME", "IS_OVERTIME" };
//var fireJobIds = GetEntities<T_FO_FIRE_JOB>(i => i.CREATE_TIME >= startTime && i.IS_DELETED == false && i.APPLY_DEPARTMENT_ID != null, baseFilter).Select(t => t.ID).ToList();
baseFilter.SelectField = new string[] { "ID", "NOTICE_STATUS", "CREATE_TIME", "SOURCE_DATA_ID" }; //指定字段，包括导航属性 baseFilter.SelectField = new string[] { "ID", "NOTICE_STATUS", "CREATE_TIME", "SOURCE_DATA_ID" }; //指定字段，包括导航属性
var tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => t.IS_DELETED == false && t.CREATE_TIME >= startTime && t.NOTICE_STATUS == 2 && jobIds.Contains((Guid)t.SOURCE_DATA_ID), baseFilter).ToList(); var tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => t.IS_DELETED == false && t.CREATE_TIME >= startTime && t.NOTICE_STATUS == 2 && jobIds.Contains((Guid)t.SOURCE_DATA_ID), baseFilter).ToList();
foreach (var item in jobInfos) foreach (var item in jobInfos)

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

@ -9078,6 +9078,11 @@ 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 completions = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => !t.IS_DELETED, filter);
var countTj = completions.Where(t => t.AUDIT_LEVEL == (int)HMOperationTaskAuditEnum.特级审批).Count();
T_FM_RISK_LEVEL_PROPORTION levelTj = new T_FM_RISK_LEVEL_PROPORTION();
levelTj.RISK_LEVEL = "特级审批";
levelTj.COUNT = countTj;
completionSorts.Add(levelTj);
var count1 = completions.Where(t => t.AUDIT_LEVEL == (int)HMOperationTaskAuditEnum.一级审批).Count(); var count1 = completions.Where(t => t.AUDIT_LEVEL == (int)HMOperationTaskAuditEnum.一级审批).Count();
T_FM_RISK_LEVEL_PROPORTION level1 = new T_FM_RISK_LEVEL_PROPORTION(); T_FM_RISK_LEVEL_PROPORTION level1 = new T_FM_RISK_LEVEL_PROPORTION();
level1.RISK_LEVEL = "一级审批"; level1.RISK_LEVEL = "一级审批";
@ -9103,6 +9108,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
level5.RISK_LEVEL = "无审批层级"; level5.RISK_LEVEL = "无审批层级";
level5.COUNT = count5; level5.COUNT = count5;
completionSorts.Add(level5); completionSorts.Add(level5);
var count6 = completions.Where(t => t.AUDIT_LEVEL == (int)HMOperationTaskAuditEnum.临时用电).Count();
T_FM_RISK_LEVEL_PROPORTION level6 = new T_FM_RISK_LEVEL_PROPORTION();
level6.RISK_LEVEL = "临时用电";
level6.COUNT = count6;
completionSorts.Add(level6);
return completionSorts; return completionSorts;
}); });
} }