lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-07-17 14:29:32 +08:00
parent f0e0ef7c7a
commit 3b9e01f8a3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
View File

@ -2988,7 +2988,7 @@ namespace BLL
from projectType in projectTypeJoin.DefaultIfEmpty() 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 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() from sysConst in sysConstJoin.DefaultIfEmpty()
where project.ProjectState == "1" where project.ProjectState == "1" && project.MasterSysId != null
select new ProjectOutput select new ProjectOutput
{ {
ProjectId = project.ProjectId, ProjectId = project.ProjectId,
@ -3050,7 +3050,7 @@ namespace BLL
ConstructionMoney = project.ConstructionMoney, ConstructionMoney = project.ConstructionMoney,
ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" : (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"), ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" : (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"),
ProjectState = project.ProjectState, ProjectState = project.ProjectState,
ProjectAttributeName = "工程", ProjectAttributeName = "工程",
ProjectMoney = project.ProjectMoney, ProjectMoney = project.ProjectMoney,
DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days, DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days,
ProjectTypeName = projectType.ProjectTypeName, ProjectTypeName = projectType.ProjectTypeName,
@ -4016,7 +4016,7 @@ namespace BLL
from y in yGroup.DefaultIfEmpty() from y in yGroup.DefaultIfEmpty()
join z in Funs.DB.Base_RiskLevel on y.HazardLevel equals z.RiskLevelId into zGroup join z in Funs.DB.Base_RiskLevel on y.HazardLevel equals z.RiskLevelId into zGroup
from z in zGroup.DefaultIfEmpty() 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 group new { y, z } by new { x.ProjectId, x.ProjectName, x.ProjectCode } into gg
select new SecurityRiskOutput select new SecurityRiskOutput
{ {
@ -4234,7 +4234,7 @@ namespace BLL
from bc in bcGroup.DefaultIfEmpty() from bc in bcGroup.DefaultIfEmpty()
join su1 in Funs.DB.Person_Persons on q.AuditorId equals su1.PersonId into su1Group join su1 in Funs.DB.Person_Persons on q.AuditorId equals su1.PersonId into su1Group
from su1 in su1Group.DefaultIfEmpty() 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 select new Model.OfSafetySupervisorsOutput
{ {
ProjectId = p.ProjectId, ProjectId = p.ProjectId,