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

修改接口

Browse Source
This commit is contained in:
高飞
2023-09-18 19:58:10 +08:00
parent ba8a84b2e0
commit 1c9a21058e
6 changed files with 211 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+37 -2
View File
@@ -137,6 +137,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
public string ProjectId { get; set; }
public DateTime? Mdate { get; set; }
public string state { get; set; }
}
#region 生成按钮
@@ -171,7 +173,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
{
ProblemTypes = x.ProblemTypes,
ProjectId = x.ProjectId,
CheckTime=x.CheckTime
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();
@@ -196,7 +199,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
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 }).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
@@ -335,6 +338,21 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
allList.Add(model);
//安全巡检已闭合
model = new Inspection_Summary();
model.ProjectId = pid;
model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "28";
AqxjCount = list2.Where(x => x.ProjectId == pid && x.States=="3").ToList().Count();
model.SummeryResult = AqxjCount.ToString();
//时间
if (AqxjCount > 0)
{
model.CompileDate = list2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CheckTime).FirstOrDefault().CheckTime;
}
allList.Add(model);
//周例会
model = new Inspection_Summary();
@@ -437,6 +455,23 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
}
allList.Add(model);
//质量巡检已闭合项
model = new Inspection_Summary();
model.ProjectId = pid;
model.CompileDate = DateTime.Now;
model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "29";
//已闭合
ZlxjCount = list8.Where(x => x.ProjectId == pid&&x.state=="7").ToList().Count;
model.SummeryResult = ZlxjCount.ToString();
if (ZlxjCount > 0)
{
//巡检日期
model.CompileDate = list8.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
}
allList.Add(model);
//WBS数据
model = new Inspection_Summary();
model.ProjectId = pid;