1

2025-11-29 14:35:49 +08:00
parent c7e265f71b
commit 7a6128c46f
4 changed files with 15 additions and 10 deletions
@@ -243,7 +243,9 @@ namespace FineUIPro.Web.common

                #endregion

-
+                var personLists = BLL.PersonService.GetPersonList(projectId);
+                var ProjectPersonnelNum = personLists.Where(x => x.ProjectId == projectId && x.IsUsedType == "1").ToList();
+                var projectUsers = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == projectId).ToList();
                // 构造返回数据
                var returnData = new
                {
@@ -260,8 +262,11 @@ namespace FineUIPro.Web.common
                            // projectSum = (hsseData.ProjectInspectorGeneralNum ?? 0) + (hsseData.ProjectFullTimeNum ?? 0) + (hsseData.ProjectSafetyMonitorNum ?? 0),//项目总人数
                            projectDirector = hsseData.ProjectInspectorGeneralNum ?? 0,//项目总监
                            projectFullTime = hsseData.ProjectFullTimeNum ?? 0,//项目专职
-                            projectSafetyMonitoring = hsseData.ProjectSafetyMonitorNum ?? 0,//项目安全监护
-                            projectSecurity = 0,//项目安管人员【待汇总】
+                            // projectSafetyMonitoring = hsseData.ProjectSafetyMonitorNum ?? 0,//项目安全监护
+                            // projectSecurity = 0,//项目安管人员【待汇总】
+                            ManagersPersonneNum = projectUsers.Count,//管理人员
+                            ProjectPersonnelNum = ProjectPersonnelNum.Count,//项目人员
+                            
                            projectPersonRatio = "1:5",//项目安管人员与作业人员配比【待汇总】
                            WorkAreaNum =  workAreaNum ?? 0,
                        },