From 6d8f91dc7c3586f9c590f13dfc75da46c129cef2 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: Fri, 19 Dec 2025 16:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8E=B0=E5=9C=BA=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BIStatiscialAnalysisController.cs         | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

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 517adc5..3c20e35 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -9617,13 +9617,14 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
             return SafeExecute<List<T_FM_DEPARTMENT_COMPLETION_SORT>>(() =>
             {
                 var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
-                var mineType = 30;
+                //var mineType = 30;
                 var departmentIds = new List<Guid>();
                 List<GroupbyDepartmentId> completionLists = new List<GroupbyDepartmentId>();
-                List<T_FM_DEPARTMENT_COMPLETION_SORT> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION_SORT>();
-                if (string.IsNullOrEmpty(filter.Keyword))
-                    return completionSorts;
-                var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
+                List<T_FM_DEPARTMENT_COMPLETION_SORT> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION_SORT>();
+                //if (string.IsNullOrEmpty(filter.Keyword))
+                //    return completionSorts;
+                //var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
+                var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(orgId));
                 if (departmentInfo == null || !departmentInfo.Any())
                     return completionSorts;
                 else
@@ -9708,13 +9709,14 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
             {
                 dynamic ret = new System.Dynamic.ExpandoObject();
                 var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
-                var mineType = 30;
+                //var mineType = 30;
                 var departmentIds = new List<Guid>();
                 List<GroupbyDepartmentCompletion> completionLists = new List<GroupbyDepartmentCompletion>();
-                List<T_FM_DEPARTMENT_COMPLETION> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION>();
-                if (string.IsNullOrEmpty(filter.Keyword))
-                    return ret;
-                var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
+                List<T_FM_DEPARTMENT_COMPLETION> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION>();
+                //if (string.IsNullOrEmpty(filter.Keyword))
+                //    return ret;
+                //var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
+                var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(orgId));
                 if (departmentInfo == null || !departmentInfo.Any())
                     return ret;
                 else