From 913dd5de3aa2abfcc9325cded4490fcdf4e16882 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 20 Oct 2023 17:25:08 +0800 Subject: [PATCH] 2023-10-20 --- .../版本日志/SGGLDB_WH_2023-10-20.sql | Bin 0 -> 28106 bytes .../ProcessControl/InspectionNoticeEdit.aspx | 2 +- .../InspectionNoticeEdit.aspx.cs | 8 +++--- SGGL/FineUIPro.Web/common/mainProject2.aspx | 8 +++--- .../FineUIPro.Web/common/mainProject2.aspx.cs | 27 ++++++++++++++++-- 5 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-10-20.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-10-20.sql b/DataBase/版本日志/SGGLDB_WH_2023-10-20.sql new file mode 100644 index 0000000000000000000000000000000000000000..e321299bc6b71f4aeea6451fbf074decb7eeb367 GIT binary patch literal 28106 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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx index 53216b6d..6d83600f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx @@ -60,7 +60,7 @@ EnableMultiSelect="true"> <%-- --%> - diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index bafdd799..1b1e5e13 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -128,12 +128,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl inspectionManagement.InspectionId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagement)); this.hdInspectionNoticeId.Text = inspectionManagement.InspectionId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); + /*var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) { Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); return; - } + }*/ BLL.InspectionManagementService.AddInspectionManagement(inspectionManagement); } @@ -152,11 +152,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2; inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim(); var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + /*if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) { Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); return; - } + }*/ BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement); BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId); } diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx index 27bccc42..3b29d221 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx @@ -178,19 +178,19 @@
动火
-
<%=getWrokCount0() %>
+
<%=getWrokCount0() %>/<%=getALLWrokCount0() %>
高处
-
<%=getWrokCount1() %>
+
<%=getWrokCount1() %>/<%=getALLWrokCount1() %>
吊装
-
<%=getWrokCount2() %>
+
<%=getWrokCount2() %>/<%=getALLWrokCount2() %>
其他
-
<%=getWrokCount3() %>
+
<%=getWrokCount3() %>/<%=getALLWrokCount3() %>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index eb063ef6..13b97970 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -65,11 +65,12 @@ namespace FineUIPro.Web.common //安全管理人员 var allSum = from x in Funs.DB.SitePerson_Person - where x.IsUsed == true && x.ProjectId == ProjectId + where x.ProjectId == ProjectId && x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now) select x; + var glAllPerson = from x in allSum join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where y.IsHsse==true && x.ProjectId == ProjectId //安管人员 + where y.IsHsse==true && x.ProjectId == ProjectId //安管人员 select x; this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString(); @@ -511,18 +512,32 @@ namespace FineUIPro.Web.common var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证" &&x.WorkStatesStr=="作业中").ToList().Count; return result; } - + protected int getALLWrokCount0() + { + var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证" ).ToList().Count; + return result; + } protected int getWrokCount1() { var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证" && x.WorkStatesStr == "作业中").ToList().Count; return result; } + protected int getALLWrokCount1() + { + var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证" ).ToList().Count; + return result; + } protected int getWrokCount2() { var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count; return result; } + protected int getALLWrokCount2() + { + var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证").ToList().Count; + return result; + } protected int getWrokCount3() { @@ -530,6 +545,12 @@ namespace FineUIPro.Web.common && x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证" && x.WorkStatesStr == "作业中").ToList().Count; return result; } + protected int getALLWrokCount3() + { + var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId + && x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证" ).ToList().Count; + return result; + } #endregion #region 质量问题