diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql b/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql new file mode 100644 index 00000000..ed3c8b78 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql @@ -0,0 +1,5 @@ +UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [Risk_Level] = 'һ��' WHERE Risk_Level is null or Risk_Level = ''; +go + +UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [ProblemTypes] = '0' WHERE ProblemTypes is null or Risk_Level = ''; +go \ No newline at end of file diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index 9bc32644..bd63ce76 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -113,7 +113,7 @@ namespace BLL newHazardRegister.ProblemTypes = hazardRegister.ProblemTypes; newHazardRegister.DIC_ID = hazardRegister.DIC_ID; newHazardRegister.Type = hazardRegister.Type; - + newHazardRegister.Risk_Level = hazardRegister.Risk_Level; newHazardRegister.HiddenType = hazardRegister.HiddenType; //把附件表的路径复制过来 Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId); diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs index f40ecda1..d7f72a25 100644 --- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs @@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow from EduTrain_TrainRecord AS TrainRecord LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId - + where Project.ProjectState ='1' UNION ALL select @@ -91,7 +91,7 @@ namespace FineUIPro.Web.DataShow TrainDepart as UnitName From Bo_Sheng_Train F LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId - )f WHERE 1=1 "; + )f WHERE 1=1 and Project.ProjectState ='1' "; #region 总数 var strSqlSum = @"select Count(*)as allCount from( @@ -112,7 +112,7 @@ namespace FineUIPro.Web.DataShow from EduTrain_TrainRecord AS TrainRecord LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId - + where Project.ProjectState ='1' UNION ALL select @@ -129,7 +129,7 @@ namespace FineUIPro.Web.DataShow TrainDepart as UnitName From Bo_Sheng_Train F LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId - )f WHERE 1=1"; + )f WHERE 1=1 and Project.ProjectState ='1'" ; #endregion if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs index 292f2d1b..aefd1a78 100644 --- a/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs @@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow -where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) "; +where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and Project.ProjectState ='1'"; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs index bde213cd..e014510a 100644 --- a/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs @@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow -where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') "; +where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') and Project.ProjectState ='1'"; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs index bda66e82..fc16a286 100644 --- a/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs @@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow -where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' "; +where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' and Project.ProjectState ='1'"; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs index 878dadc8..7026ead6 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs @@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow FROM SitePerson_Person AS Person LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId - LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 "; + LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 and Project.ProjectState ='1'"; if (this.drpProject.SelectedValue != Const._Null) { strSql += " AND Person.ProjectId = @ProjectId"; diff --git a/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs index 9b40d41a..0f966f1c 100644 --- a/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId - WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) "; + WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) and Project.ProjectState ='1' "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs index 2144b5d2..990bea8a 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs @@ -173,7 +173,29 @@ namespace FineUIPro.Web.common .SelectMany(x => x.persons.DefaultIfEmpty(), (x, person) => new { x.post, person }) .Where(x => pids.Contains(x.person.ProjectId)); - divCqmsManageNum.InnerText = qualityQuery.Count().ToString(); + + //企业总部人员和分支机构人员 + var query = (from person in db.Person_CompanyBranchPerson + join unit in db.Base_Unit on person.UnitId equals unit.UnitId into unitJoin + from unit in unitJoin.DefaultIfEmpty() // 左连接 + join workPost in db.Base_WorkPost on person.WorkPostId equals workPost.WorkPostId into workPostJoin + from workPost in workPostJoin.DefaultIfEmpty() // 左连接 + where person.IsOnJob == true && workPost.IsCQMS == true + select new + { + ID = person.CompanyBranchPersonId, + UnitName = unit.UnitName, + PersonName = person.PersonName, + SexStr = person.Sex == "1" ? "男" : "女", + IdentityCard = person.IdentityCard, + WorkPostName = workPost.WorkPostName, + Telephone = person.Telephone, + IsOnJob = person.IsOnJob, + Remark = person.Remark, + ProjectName = "" + }).ToList(); + + divCqmsManageNum.InnerText = (qualityQuery.Count() + query.Count()).ToString(); // 质量培训人员 divCqmsPxNum.InnerText = db.Comprehensive_InspectionPerson .Where(x => pids.Contains(x.ProjectId)) @@ -674,16 +696,15 @@ namespace FineUIPro.Web.common if (pids == null) { zlallNumber = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now select x).Count().ToString(); var num2 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State == "7" + where x.State == "7" select x).Count(); zlfinishNumber = num2.ToString(); var num3 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State != "7" + where x.State != "7" select x).Count(); var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); @@ -695,16 +716,16 @@ namespace FineUIPro.Web.common else { zlallNumber = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId) + where pids.Contains(x.ProjectId) select x).Count().ToString(); var num2 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId) + where x.State == "7" && pids.Contains(x.ProjectId) select x).Count(); zlfinishNumber = num2.ToString(); var num3 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId) + where x.State != "7" && pids.Contains(x.ProjectId) select x).Count(); var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); @@ -778,7 +799,7 @@ namespace FineUIPro.Web.common List listdata = new List(); double result = 0; Model.SGGLDB db = Funs.DB; - var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x; + var ndtLists = from x in db.ProcessControl_NondestructiveTest_New select x; if (pids != null) { ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId));