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

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2025-11-17 20:31:58 +08:00
parent 0fd29567b1 163e8586dd
commit 5bdff8a875
25 changed files with 4343 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs
+4 -2
View File
@@ -40,7 +40,9 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string projectId, string states, string checkType, string checkItemSetId, DateTime? startTime, DateTime? endTime, Grid Grid1)
{
IQueryable<Model.Check_CheckSpecial> getDataList = getDataLists;
Model.SGGLDB db = Funs.DB;
IQueryable<Model.Check_CheckSpecial> getDataList = from x in db.Check_CheckSpecial
select x;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(e => e.ProjectId == projectId);
@@ -87,7 +89,7 @@ namespace BLL
x.CheckSpecialId,
x.CheckTime,
x.CheckSpecialCode,
CheckItemName = Funs.DB.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
CheckItemName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
CheckTypeName = x.CheckType == "1" ? "联合检查" : "专项检查",
StatesName = x.States == "2" ? "已完成" : (x.States == "1" ? "待整改" : "待提交"),
};
SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs
+5 -4
View File
@@ -45,7 +45,9 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1)
{
IQueryable<Model.Check_ProjectLeaderCheck> getDataList = getDataLists;
Model.SGGLDB db = Funs.DB;
IQueryable<Model.Check_ProjectLeaderCheck> getDataList = from x in db.Check_ProjectLeaderCheck
select x;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(x => x.ProjectId == projectId);
@@ -72,16 +74,15 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
join y in db1.Base_Project on x.ProjectId equals y.ProjectId
join y in db.Base_Project on x.ProjectId equals y.ProjectId
into ps
from y in ps.DefaultIfEmpty()
select new
{
x.ProjectLeaderCheckId,
x.ProjectId,
db1.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
x.CheckCode,
x.UnitIds,
x.LeaderIds,