From 3b9e01f8a35e4da4de22560391bdc140d5af25dc Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 17 Jul 2025 14:29:32 +0800 Subject: [PATCH] 1 --- SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs index ab479694..e3785929 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs @@ -2988,7 +2988,7 @@ namespace BLL from projectType in projectTypeJoin.DefaultIfEmpty() join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = "", GroupId = BLL.ConstValue.GroupId_ProjectState } equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin from sysConst in sysConstJoin.DefaultIfEmpty() - where project.ProjectState == "1" + where project.ProjectState == "1" && project.MasterSysId != null select new ProjectOutput { ProjectId = project.ProjectId, @@ -3050,7 +3050,7 @@ namespace BLL ConstructionMoney = project.ConstructionMoney, ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" : (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"), ProjectState = project.ProjectState, - ProjectAttributeName = "工程", + ProjectAttributeName = "工程", ProjectMoney = project.ProjectMoney, DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days, ProjectTypeName = projectType.ProjectTypeName, @@ -4016,7 +4016,7 @@ namespace BLL from y in yGroup.DefaultIfEmpty() join z in Funs.DB.Base_RiskLevel on y.HazardLevel equals z.RiskLevelId into zGroup from z in zGroup.DefaultIfEmpty() - where BeUnderConstructionList.Contains(x.ProjectId) + where BeUnderConstructionList.Contains(x.ProjectId) group new { y, z } by new { x.ProjectId, x.ProjectName, x.ProjectCode } into gg select new SecurityRiskOutput { @@ -4234,7 +4234,7 @@ namespace BLL from bc in bcGroup.DefaultIfEmpty() join su1 in Funs.DB.Person_Persons on q.AuditorId equals su1.PersonId into su1Group from su1 in su1Group.DefaultIfEmpty() - where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 + where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 select new Model.OfSafetySupervisorsOutput { ProjectId = p.ProjectId,