zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
李超 2024-05-06 17:24:32 +08:00
parent b1c21ffc8a
commit 0ede39d15e
5 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SGGL/BLL/API/HSSE/APIResourcesService.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using NPOI.POIFS.Properties;
using System.Collections.Generic;
using System.Linq;
namespace BLL
@ -218,7 +219,24 @@ namespace BLL
SupResourcesId = x.SupTrainingId,
IsEndLever = x.IsEndLever,
};
return getDataLists.ToList();
var getAllDataLists = from x in db.Training_TestTraining
select new Model.ResourcesItem
{
ResourcesId = x.TrainingId,
ResourcesCode = x.TrainingCode,
ResourcesName = x.TrainingName,
SupResourcesId = x.SupTrainingId,
IsEndLever = x.IsEndLever,
};
var res = getDataLists.ToList();
foreach (var x in res)
{
x.child = getAllDataLists.Where(xx => xx.SupResourcesId == x.ResourcesId).ToList();
}
return res;
}
}

12
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -212,6 +212,7 @@
{
var list = (from x in Funs.DB.Base_Project
where x.ProjectState == null || x.ProjectState == BLL.Const.ProjectState_1
where x.ProjectState != "3"
orderby x.ProjectCode descending
select x).ToList();
return list;
@ -254,7 +255,7 @@
}
else
{
var list = (from x in Funs.DB.Base_Project
var list = (from x in Funs.DB.Base_Project
where x.ProjectState == state
orderby x.ProjectCode descending
select x).ToList();
@ -269,7 +270,8 @@
public static List<Model.Base_Project> GetAllProjectDropDownList()
{
var list = (from x in Funs.DB.Base_Project
orderby x.ProjectCode descending
where x.ProjectState != "3"
orderby x.ProjectCode descending
select x).ToList();
return list;
}
@ -283,6 +285,7 @@
{
var list = (from x in Funs.DB.Base_Project
where x.ProjectType == projectType
where x.ProjectState != "3"
orderby x.ProjectCode descending
select x).ToList();
return list;
@ -296,7 +299,8 @@
{
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{
return (from x in Funs.DB.Base_Project
return (from x in Funs.DB.Base_Project
where x.ProjectState != "3"
orderby x.ProjectCode descending
select x).ToList();
}
@ -308,6 +312,7 @@
if (getRoleP != null)
{
return (from x in Funs.DB.Base_Project
where x.ProjectState != "3"
orderby x.ProjectCode descending
select x).ToList();
}
@ -316,6 +321,7 @@
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
where y.UserId == userId
where x.ProjectState != "3"
orderby x.ProjectCode descending
select x).Distinct().ToList();
}

2
SGGL/FineUIPro.Web/Web.config
View File

@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_CD;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB_CD;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true; Connect Timeout=1200;Pooling=true; MAX Pool Size=512;Min Pool Size=50;Connection Lifetime=30" />
<add key="ConnectionString" value="Server=.;Database=SGGLDB_CD;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true; Connect Timeout=1200;Pooling=true; MAX Pool Size=512;Min Pool Size=50;Connection Lifetime=30" />
<!--系统名称-->
<add key="SystemName" value="数字化施工管理信息平台V1.0" />
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />

1
SGGL/FineUIPro.Web/ZHGL/ManagementReport/HSSEMonthReport.aspx.cs
View File

@ -35,6 +35,7 @@ namespace FineUIPro.Web.ZHGL.ManagementReport
var project = (from x in Funs.DB.HSSE_MonthReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState !="3"
select new { x.ProjectId, y.ProjectName }).Distinct();
if (project.Count() > 0)
{

2
SGGL/Model/APIItem/HSSE/ResourcesItem.cs
View File

@ -52,5 +52,7 @@ namespace Model
get;
set;
}
public List<ResourcesItem> child { get; set; }
}
}