lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
高飞 2024-07-15 15:11:59 +08:00
parent 81afc4684a 2fed6b84af
commit 23c5d4ecda
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
View File

@ -277,10 +277,10 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
//一次共检合格数
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();
select new { x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
////总数
var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement
select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.CompileDate }).ToList();
select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.InspectionDate }).ToList();
//关键事项
var list22 = (from x in Funs.DB.GJSX
@ -729,7 +729,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
if (hgs>0)
{
//验收日期
model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CompileDate).FirstOrDefault().CompileDate;
model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InspectionDate).FirstOrDefault().InspectionDate;
}
model.SummeryResult = hgs.ToString();
allList.Add(model);