From 4eb8c4307c17a4ac54e14a5732f41b70111a6b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 16:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APT.PP.WebApi/Controllers/Api/FMController.cs  |  9 ++++++---
 .../BIController/BIStatiscialAnalysisController.cs | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
index 25cb447..d8b6524 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
@@ -809,8 +809,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                 try
                 {
                     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 tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => jobIds.Contains((Guid)t.SOURCE_DATA_ID), new BaseFilter(filter.GetOrgId()))
+                    var jobIds = GetEntities<T_FO_CRUCIAL_LICENSE_JOB>(i => true, new BaseFilter(filter.GetOrgId())).Select(t => t.ID).ToList();
+                    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();
                     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();
@@ -892,7 +893,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     var departments = GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED, baseFilter);
                     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 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" };   //指定字段，包括导航属性
                     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)
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
index cb6a341..b6a0f58 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -9077,7 +9077,12 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
             {
                 List<T_FM_RISK_LEVEL_PROPORTION> completionSorts = new List<T_FM_RISK_LEVEL_PROPORTION>();
                 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();
                 T_FM_RISK_LEVEL_PROPORTION level1 = new T_FM_RISK_LEVEL_PROPORTION();
                 level1.RISK_LEVEL = "一级审批";
@@ -9102,7 +9107,12 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                 T_FM_RISK_LEVEL_PROPORTION level5 = new T_FM_RISK_LEVEL_PROPORTION();
                 level5.RISK_LEVEL = "无审批层级";
                 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;
             });
         }