提交代码

This commit is contained in:
2024-05-14 09:03:31 +08:00
parent c57b03d665
commit 3c73800853
26 changed files with 3821 additions and 542 deletions
@@ -250,15 +250,12 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
}).ToList();
//一次共检合格数
var list20 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where y.IsOnceQualified == true && y.InspectionDate != null
select new { y.ProjectId,y.InspectionDate,y.IsOnceQualified,x.InspectionId, Isid= y.InspectionId }).ToList();
var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true
select new { x.ProjectId,x.CompileDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
////总数
var list21 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where y.InspectionDate != null
select new { y.ProjectId, x.InspectionId, Isid = y.InspectionId,y.InspectionDate }).ToList();
var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement
select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.CompileDate }).ToList();
//关键事项
var list22 = (from x in Funs.DB.GJSX
@@ -639,7 +636,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
if (hgs>0)
{
//验收日期
model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InspectionDate).FirstOrDefault().InspectionDate;
model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CompileDate).FirstOrDefault().CompileDate;
}
model.SummeryResult = hgs.ToString();
allList.Add(model);