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

20240604 修改各项目巡查汇总

Browse Source
This commit is contained in:
毕文静
2024-06-04 15:52:03 +08:00
parent 864ba2551b
commit d340e503ac
19 changed files with 1832 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+57 -20
View File
@@ -173,13 +173,13 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
{
ProblemTypes = x.ProblemTypes,
ProjectId = x.ProjectId,
CheckTime=x.CheckTime,
States=x.States
CheckTime = x.CheckTime,
States = x.States
}).Where(x => x.ProblemTypes == "1").ToList();
//周例会
var list3 = Funs.DB.Meeting_WeekMeeting.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.WeekMeetingDate }).ToList();
var list3 = Funs.DB.Meeting_WeekMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.WeekMeetingDate }).ToList();
//月例会
var list4 = Funs.DB.Meeting_MonthMeeting.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.MonthMeetingDate }).ToList();
var list4 = Funs.DB.Meeting_MonthMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.MonthMeetingDate }).ToList();
//作业票
var list5 = Funs.DB.View_License_LicenseManager
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
//工程师日志
var list6 = (from x in Funs.DB.Manager_HSSELog
where x.IsVisible !=false
where x.IsVisible != false
select new
{
x.ProjectId,
@@ -196,30 +196,34 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
x.IsVisible
}).ToList();
//HSE管理月报
var list7 = Funs.DB.Manager_MonthReportC.Select(x=> new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.Months }).ToList();
var list7 = Funs.DB.Manager_MonthReportC.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.Months }).ToList();
//质量巡检
var list8 = Funs.DB.Check_CheckControl.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.CheckDate,state=x.State }).ToList();
var list8 = Funs.DB.Check_CheckControl.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.CheckDate, state = x.State }).ToList();
//设备材料报验
var list10 = Funs.DB.Comprehensive_InspectionEquipment.Select
(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.InspectionDate }).ToList();
(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.InspectionDate }).ToList();
//人员报验
var list11 = Funs.DB.Comprehensive_InspectionPerson.
Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.ApprovalTime }).ToList();
Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.ApprovalTime }).ToList();
//机具报验
var list13 = Funs.DB.Comprehensive_InspectionMachine
.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.InspectionDate }).ToList();
.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.InspectionDate }).ToList();
//设计变更管理
var list14 = Funs.DB.Comprehensive_DesignChangeOrder
.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.IssuedDate }).ToList();
.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.IssuedDate }).ToList();
//施工方案管理
var list15 = Funs.DB.Comprehensive_GeneralPlanApproval
.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.ApprovalDate }).ToList();
.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.ApprovalDate }).ToList();
//超过一定规模的危大施工方案
var list15_2 = Funs.DB.Comprehensive_MajorPlanApproval
.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.ApprovalDate }).ToList();
//设计交底管理
var list16 = Funs.DB.Comprehensive_DesignDetails
@@ -239,6 +243,16 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
x.ReportType
}).ToList();
//质量周报（新）
var list18_2 = (from x in Funs.DB.Report_WeekAndMonthReport_New
where x.ReportType == "2"
select new
{
x.ProjectId,
x.EndDate,
x.ReportType
}).ToList();
//质量月报
var list19 = (from x in Funs.DB.Report_WeekAndMonthReport
where x.ReportType == "2"
@@ -249,6 +263,16 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
x.ReportType
}).ToList();
//质量月报（新）
var list19_2 = (from x in Funs.DB.Report_WeekAndMonthReport_New
where x.ReportType == "1"
select new
{
x.ProjectId,
x.EndDate,
x.ReportType
}).ToList();
//一次共检合格数
var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true
@@ -554,10 +578,15 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "15";
var SgfaCount = list15.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = SgfaCount.ToString();
if (SgfaCount>0)
var bigCount = list15_2.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = (SgfaCount + bigCount).ToString();
if (bigCount > 0 && SgfaCount == 0)
{
//审批日期
model.CompileDate = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
}
else if (SgfaCount > 0)
{
model.CompileDate = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
}
allList.Add(model);
@@ -601,10 +630,14 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "18";
var SgzbCount = list18.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = SgzbCount.ToString();
if (SgzbCount>0)
var newSgzbCount = list18_2.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = (SgzbCount + newSgzbCount).ToString();
if (SgzbCount == 0 && newSgzbCount > 0)
{
model.CompileDate = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
else if (SgzbCount > 0)
{
//StartDate,EndDate
model.CompileDate = list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
allList.Add(model);
@@ -616,10 +649,14 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "19";
var SgybCount = list19.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = SgybCount.ToString();
if (SgybCount>0)
var newSgybCount = list19_2.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = (SgybCount+ newSgybCount).ToString();
if (newSgybCount > 0 && SgybCount == 0)
{
model.CompileDate = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
else if (SgybCount > 0)
{
//StartDate,EndDate
model.CompileDate = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
allList.Add(model);