From 5fb846030fb29291dd7132dae4d754b82981291b Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 18 Nov 2024 17:44:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionMachineDataIn.aspx.cs | 2 +- .../CQMS/ManageReport/NCRStatisc.aspx.cs | 10 ++- .../Transfer/Chart/Systemstatus.aspx.cs | 14 ++-- .../Transfer/Chart/SystemstatusChart.aspx.cs | 72 +++++++++---------- SGGL/FineUIPro.Web/Transfer/Electrical.aspx | 2 +- .../Transfer/Instrumentation.aspx | 2 +- .../Transfer/LHCSystemList.aspx.cs | 3 +- SGGL/FineUIPro.Web/Transfer/Piping.aspx | 2 +- .../Transfer/RotatingEquipment.aspx | 2 +- .../Transfer/StaticEquipment.aspx | 2 +- 10 files changed, 59 insertions(+), 52 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs index 2360fcd0..2c786170 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs @@ -490,7 +490,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.TestCycle = pds.Rows[i][7].ToString().Trim(); - Ins.IsOnSite = pds.Rows[i][8].ToString().Trim() == "是" ? true : false; + Ins.IsVerification = pds.Rows[i][8].ToString().Trim() == "是" ? true : false; if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) { diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs index 60ca2d1f..d91d6e0f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs @@ -16,7 +16,8 @@ namespace FineUIPro.Web.CQMS.ManageReport protected void Page_Load(object sender, EventArgs e) { - if (!IsPostBack) { + if (!IsPostBack) + { Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); this.txtStartDate.Text = "2015-01-01"; this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); @@ -104,8 +105,11 @@ namespace FineUIPro.Web.CQMS.ManageReport NCRStatisc.Num = i; NCRStatisc.WorkName = item.ProfessionalName; NCRStatisc.CheckNum = managementList.Count(); - NCRStatisc.OKNum = managementList.Count(x => x.Status == "3"); - NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3"); + //NCRStatisc.OKNum = managementList.Count(x => x.Status == "3"); + //NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3"); + int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); + NCRStatisc.OKNum = okNum; + NCRStatisc.NotOKNum = managementList.Count() - okNum; NCRStatisc.Remark = ""; if (NCRStatisc.CheckNum != 0)//被除数不能为零 { diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs index ce3af9bd..8197d60e 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs @@ -45,9 +45,9 @@ namespace FineUIPro.Web.Transfer.Chart public DataTable DataSql() { - string strSql = @"select f.SubSysNo,f.ProjectId,f.TotalFactor,f.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation, -case ISNULL(f.TotalFactor,0) when 0 then 0 -else CONVERT(DECIMAL(10,2),100*(ISNULL(f.CompleteFactor,0)*1.0/ISNULL(f.TotalFactor,0))) end CompleteProportion, + string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation, +case ISNULL(tpi3.TotalFactor,0) when 0 then 0 +else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0))) end CompleteProportion, ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount, case ISNULL(tpi.PipingCount,0) @@ -86,9 +86,9 @@ else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark from( -SELECT TestPackage as SubSysNo,ProjectId,sum(TotalFactor)as TotalFactor,sum(CompleteFactor)as CompleteFactor FROM Transfer_Piping group by TestPackage,ProjectId +SELECT Commissioningsystemcode as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by Commissioningsystemcode,ProjectId ) f -left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SubmitPackage +left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo --piping left join (select count(*)as PipingCount,ProjectId,TestPackage from Transfer_Piping @@ -103,6 +103,10 @@ left join (select count(*)as ReinstateScount,ProjectId,TestPackage from Transfer group by ProjectId,TestPackage) tpi2 on f.ProjectId=tpi2.ProjectId and f.SubSysNo=tpi2.TestPackage +left join (select sum(TotalFactor) as TotalFactor,sum(CompleteFactor) as CompleteFactor,ProjectId,TestPackage from Transfer_Piping +group by ProjectId,TestPackage) +tpi3 on f.ProjectId=tpi3.ProjectId and f.SubSysNo=tpi3.TestPackage + --设备测试包 left join (select count(*)as TseCount,ProjectId,TestPackage from Transfer_StaticEquipment group by ProjectId,TestPackage) diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs index efe5a15f..6526caf7 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs @@ -16,13 +16,13 @@ namespace FineUIPro.Web.Transfer.Chart if (!IsPostBack) { var systemCode = Funs.DB.Transfer_LHCSystemList .Where(x => x.ProjectId == CurrUser.LoginProjectId) - .GroupBy(p => new { p.SystemNo }) - .Select(p => new { SystemNo = p.Key.SystemNo }).ToList(); + .GroupBy(p => new { p.Commissioningsystemcode }) + .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); int indexRow = 1; ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", "")); foreach (var t in systemCode) { - ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SystemNo, t.SystemNo)); + ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode)); indexRow++; } @@ -40,15 +40,15 @@ namespace FineUIPro.Web.Transfer.Chart #region 统计所有 var systemCode = Funs.DB.Transfer_LHCSystemList .Where(x => x.ProjectId == CurrUser.LoginProjectId) - .GroupBy(p => new { p.SystemNo }) - .Select(p => new { SystemNo = p.Key.SystemNo }).ToList(); + .GroupBy(p => new { p.Commissioningsystemcode }) + .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue)) { systemCode= Funs.DB.Transfer_LHCSystemList .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SystemNo == ddlSystemNo.SelectedValue) - .GroupBy(p => new { p.SystemNo }) - .Select(p => new { SystemNo = p.Key.SystemNo }).ToList(); + .GroupBy(p => new { p.Commissioningsystemcode }) + .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); } #region 九个表的数据 var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList(); @@ -57,7 +57,7 @@ namespace FineUIPro.Web.Transfer.Chart var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid).ToList(); var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid).ToList(); var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid).ToList(); - var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList(); + //var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList(); var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid).ToList(); var list9 = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == pid).ToList(); #endregion @@ -67,46 +67,46 @@ namespace FineUIPro.Web.Transfer.Chart dt.Columns.Add("进行中数量", typeof(string)); dt.Columns.Add("未完成数量", typeof(string)); foreach (var t in systemCode) { - var scode = t.SystemNo; + var scode = t.Commissioningsystemcode; AllSystemNo += "'" + scode + "',"; DataRow dr = dt.NewRow(); dr["系统编号"] = scode; #region 根据系统编号获取完成的数量 - var completedCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Completed").ToList().Count() - + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count() - + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count() - + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() - + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() - + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() - + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() - + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() - + list9.Where(x => x.SystemName == scode && x.Status == "Completed").ToList().Count(); + var completedCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "Completed").ToList().Count() + + list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Completed").ToList().Count() + + list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Completed").ToList().Count() + + list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count() + + list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count() + + list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count() + //+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() + + list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count() + + list9.Where(x => x.Sub_Sys_No == scode && x.Status == "Completed").ToList().Count(); #endregion dr["完成数量"] = completedCount; completed+= "'" + completedCount.ToString() + "',"; #region 根据系统编号获取进行中数量 - var InprogressCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "In progress").ToList().Count() - + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count() - + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count() - + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() - + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() - + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() - + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() - + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() - + list9.Where(x => x.SystemName == scode && x.Status == "In progress").ToList().Count(); + var InprogressCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "In progress").ToList().Count() + + list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "In progress").ToList().Count() + + list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "In progress").ToList().Count() + + list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count() + + list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count() + + list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count() + //+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() + + list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count() + + list9.Where(x => x.Sub_Sys_No == scode && x.Status == "In progress").ToList().Count(); #endregion dr["进行中数量"] = InprogressCount; Inprogress += "'" + InprogressCount.ToString() + "',"; #region 根据系统编号获取未完成数量 - var NotStartCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Not Start").ToList().Count() - + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count() - + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count() - + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() - + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() - + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() - + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() - + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() - + list9.Where(x => x.SystemName == scode && x.Status == "Not Start").ToList().Count(); + var NotStartCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "Not Start").ToList().Count() + + list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count() + + list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count() + + list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count() + //+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list9.Where(x => x.Sub_Sys_No == scode && x.Status == "Not Start").ToList().Count(); #endregion dr["未完成数量"] = NotStartCount; NotStart += "'" + NotStartCount.ToString() + "',"; diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx index f09faa56..a81f5f1a 100644 --- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx @@ -67,7 +67,7 @@ + HeaderTextAlign="Center" MinWidth="320px"> diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx index a7c08cd6..84ede582 100644 --- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx @@ -67,7 +67,7 @@ + HeaderTextAlign="Center" MinWidth="320px"> diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs index c104f4e5..efb55a78 100644 --- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs @@ -241,8 +241,7 @@ namespace FineUIPro.Web.Transfer Response.ContentEncoding = System.Text.Encoding.UTF8; this.Grid1.PageSize = 100000; this.BindGrid(); - Response.Write(GetGridMultiHeaderTableHtml(Grid1)); - //Response.Write(GetGridTableHtml(Grid1)); + Response.Write(GetGridTableHtml(Grid1)); Response.End(); } diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx index a183294b..df9059ec 100644 --- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx @@ -59,7 +59,7 @@ + HeaderTextAlign="Center" MinWidth="300px"> diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx index e55f0e57..002665e4 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx @@ -67,7 +67,7 @@ + HeaderTextAlign="Center" MinWidth="300px"> + HeaderTextAlign="Center" MinWidth="300px">