This commit is contained in:
2025-07-17 14:29:32 +08:00
parent f0e0ef7c7a
commit 3b9e01f8a3
@@ -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,