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

20240614 菜单调整

Browse Source
This commit is contained in:
毕文静
2024-06-14 15:46:10 +08:00
parent 0860e6b9b1
commit c3a6231320
70 changed files with 3017 additions and 3683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+71 -16
View File
@@ -581,15 +581,33 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
var SgfaCount = list15.Where(x => x.ProjectId == pid).ToList().Count;
var bigCount = list15_2.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = (SgfaCount + bigCount).ToString();
if (bigCount > 0 && SgfaCount == 0)
DateTime? date1 = Convert.ToDateTime("1900-01-01");
DateTime? date2 = Convert.ToDateTime("1900-01-01");
if (SgfaCount > 0)
{
//审批日期
model.CompileDate = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
date1 = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
}
else if (SgfaCount > 0)
if (bigCount > 0)
{
model.CompileDate = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
date2 = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate;
}
if (SgfaCount > bigCount)
{
model.CompileDate = date1;
}
else
{
model.CompileDate = date2;
}
//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);
//设计交底管理
@@ -633,14 +651,33 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
var SgzbCount = list18.Where(x => x.ProjectId == pid).ToList().Count;
var newSgzbCount = list18_2.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = (SgzbCount + newSgzbCount).ToString();
if (SgzbCount == 0 && newSgzbCount > 0)
DateTime? weekDate1 = Convert.ToDateTime("1900-01-01");
DateTime? weekDate2 = Convert.ToDateTime("1900-01-01");
if(SgzbCount>0)
{
model.CompileDate = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
weekDate1= list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
else if (SgzbCount > 0)
if (newSgzbCount > 0)
{
model.CompileDate = list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
weekDate2 = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
if (weekDate1 > weekDate2)
{
model.CompileDate = weekDate1;
}
else
{
model.CompileDate = weekDate2;
}
//if (SgzbCount == 0 && newSgzbCount > 0)
//{
// model.CompileDate = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
//}
//else if (SgzbCount > 0)
//{
// model.CompileDate = list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
//}
allList.Add(model);
//质量月报
@@ -652,13 +689,31 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
var SgybCount = list19.Where(x => x.ProjectId == pid).ToList().Count;
var newSgybCount = list19_2.Where(x => x.ProjectId == pid).ToList().Count;
model.SummeryResult = (SgybCount+ newSgybCount).ToString();
if (newSgybCount > 0 && SgybCount == 0)
//if (newSgybCount > 0 && SgybCount == 0)
//{
// model.CompileDate = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
//}
//else if (SgybCount > 0)
//{
// model.CompileDate = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
//}
DateTime? monthDate1 = Convert.ToDateTime("1900-01-01");
DateTime? monthDate2= Convert.ToDateTime("1900-01-01");
if (SgybCount > 0)
{
model.CompileDate = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
monthDate1 = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
else if (SgybCount > 0)
if (newSgybCount > 0)
{
model.CompileDate = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
monthDate2 = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate;
}
if (monthDate1 > monthDate2)
{
model.CompileDate = monthDate1;
}
else
{
model.CompileDate = monthDate2;
}
allList.Add(model);
@@ -967,9 +1022,9 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
else if (column.ColumnID == "ThisProject" + (i + 1).ToString()) {
//指定哪些列再做二次加载
if (MenuC=="安全巡检"|| MenuC == "周例会" || MenuC == "安全领导小组会议" || MenuC == "作业票" || MenuC == "工程师日志" || MenuC == "HSE管理月报"
|| MenuC == "质量巡检"|| MenuC == "设备材料报验" || MenuC == "人员报验" || MenuC == "机具报验"
|| MenuC == "设计变更单管理" || MenuC == "施工方案管理"|| MenuC == "设计交底管理" || MenuC == "NCR" || MenuC == "质量周报"
|| MenuC == "质量月报" || MenuC == "一次共检合格数" || MenuC == "关键事项")
|| MenuC == "质量巡检"|| MenuC == "设备材料报验管理" || MenuC == "人员报验管理" || MenuC == "施工机具/计量器具报验管理"
|| MenuC == "设计变更管理" || MenuC == "施工方案管理"|| MenuC == "设计交底管理" || MenuC == "NRC管理" || MenuC == "项目质量周报"
|| MenuC == "项目质量月报" || MenuC == "一次共检合格数" || MenuC == "关键事项")
{
var rq = MidStrEx(html, "\"", "\"");
var num = MidStrEx(html, ">", "<");