diff --git a/DataBase/版本日志/SUBQHSE_V2026-03-01-xiaj（View_CheckSpecialProDetail）.sql b/DataBase/版本日志/SUBQHSE_V2026-03-01-xiaj（View_CheckSpecialProDetail）.sql new file mode 100644 index 00000000..b61328ac --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-03-01-xiaj（View_CheckSpecialProDetail）.sql @@ -0,0 +1,87 @@ + + +update Check_CheckSpecialProDetail +set riskLevel=1 +where riskLevel='0' or riskLevel='' or riskLevel='һ' or riskLevel='' or riskLevel is null + +go +update Check_CheckSpecialProDetail +set riskLevel=2 +where riskLevel='ϴ' or riskLevel='ϸ' + +go +update Check_CheckSpecialProDetail +set riskLevel=3 +where riskLevel='' or riskLevel='ش' + +go + + + +ALTER VIEW [dbo].[View_CheckSpecialProDetail] + AS +/*רϸбͼ*/ +SELECT detail.CheckSpecialDetailId, + detail.CheckSpecialId, + detail.CheckItem, + checkItemSet.RegisterTypesName as CheckItemName, + --detail.CheckItemType, + detail.Unqualified, + detail.SortIndex, + detail.UnitId, + detail.HandleStep, + detail.CompleteStatus, + (case when detail.CompleteStatus =1 then '' else '' end) as CompleteStatusName, + detail.LimitedDate, + detail.CompletedDate, + --detail.Suggestions, + detail.CheckContent, + detail.CheckArea, + detail.HandleWay, + detail.Suggestions, + detail.RectifyOpinion, + detail.ProposeUnitId, + workArea.UnitWorkName + (CASE WHEN workArea.ProjectType ='1' THEN '()' + WHEN workArea.ProjectType ='2' THEN '(װ)' ELSE '' END)AS CheckAreaName, + detail.DataId, + detail.DataType, + unit.UnitName, + dbo.GetConstTextByIds(detail.HandleStep) as HandleStepStr, + --const.ConstText as HandleStepStr, + (CASE WHEN detail.DataType like '%1%' + THEN '·ĵ:'+(SELECT RectifyNoticesCode FROM Check_RectifyNotices WHERE detail.DataId like '%'+RectifyNoticesId+'%') + else '' end)+ + (CASE WHEN detail.DataType like '%2%' + THEN '·:'+(SELECT PunishNoticeCode FROM Check_PunishNotice WHERE detail.DataId like '%'+PunishNoticeId+'%') + else '' end)+ + (CASE WHEN detail.DataType = '3' + THEN '·ͣ:'+(SELECT PauseNoticeCode FROM Check_PauseNotice WHERE detail.DataId like '%'+ PauseNoticeId+'%') + else '' end) AS HandleStepLink + , + --(case when detail.riskLevel ='0' then '' + -- when detail.riskLevel = '1' then 'һ' + -- when detail.riskLevel = '2' then 'ϸ' + -- when detail.riskLevel = '3' then '' + -- else detail.riskLevel end) as riskLevel, + (case when detail.riskLevel = '1' then 'һ' + when detail.riskLevel = '2' then 'ϸ' + when detail.riskLevel = '3' then '' + else 'һ' end) as riskLevel, + sysuser.userName as HSEManage + +FROM dbo.Check_CheckSpecialProDetail AS detail +LEFT JOIN dbo. HSSE_Hazard_HazardRegisterTypes AS checkItemSet ON checkItemSet.RegisterTypesId=detail.CheckItem +LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId=detail.UnitId +LEFT JOIN dbo.WBS_UnitWork AS workArea ON detail.CheckArea=workArea.UnitWorkId +LEFT JOIN dbo.Sys_User AS sysuser ON sysuser.userid=detail.HSEManage +--LEFT JOIN Sys_Const AS const ON const.ConstValue = detail.HandleStep and const.GroupId='HandleStep' + + + + + + + +GO + + diff --git a/SGGL/BLL/HSSE/Check/Check_CheckSpecialProService.cs b/SGGL/BLL/HSSE/Check/Check_CheckSpecialProService.cs index decf7e18..c1b6c7ae 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckSpecialProService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckSpecialProService.cs @@ -262,10 +262,11 @@ namespace BLL // register.Risk_Level = item.RiskLevel; switch (item.RiskLevel) { - case "0": register.Risk_Level = "一般"; break; + //case "0": register.Risk_Level = "一般"; break; case "1": register.Risk_Level = "一般"; break; case "2": register.Risk_Level = "较大"; break; case "3": register.Risk_Level = "重大"; break; + default: register.Risk_Level = "一般"; break; } register.Requirements = item.Suggestions; register.CheckSpecialId = item.CheckSpecialId; diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProDetailIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProDetailIn.aspx.cs index 836ada71..8424d46b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProDetailIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProDetailIn.aspx.cs @@ -67,7 +67,8 @@ namespace FineUIPro.Web.HSSE.Check public static List hseManagers = new List(); public static List types = new List(); - public static List validLevelStrings = new List { "低风险", "一般风险", "较大风险", "重大风险" }; + //public static List validLevelStrings = new List { "低风险", "一般风险", "较大风险", "重大风险" }; + public static List validLevelStrings = new List { "一般风险", "较大风险", "重大风险" }; public static List validStateStrings = new List { "待整改", "已整改" }; public static List validTypeStrings = new List { "当场纠正", "口头警告" }; @@ -365,11 +366,11 @@ namespace FineUIPro.Web.HSSE.Check { switch (levelName) { - case "低": RiskLevel = "0"; break; + //case "低": RiskLevel = "0"; break; case "一般": RiskLevel = "1"; break; case "较高": RiskLevel = "2"; break; case "高": RiskLevel = "3"; break; - default: RiskLevel = "0"; break; + default: RiskLevel = "1"; break; } } else diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProEdit.aspx.cs index 17851848..35af20e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialProEdit.aspx.cs @@ -565,7 +565,7 @@ namespace FineUIPro.Web.HSSE.Check } switch (values.Value("RiskLevel")) { - case "低": newDetail.RiskLevel = "0"; break; + //case "低": newDetail.RiskLevel = "0"; break; case "一般": newDetail.RiskLevel = "1"; break; case "较高": newDetail.RiskLevel = "2"; break; case "高": newDetail.RiskLevel = "3"; break; @@ -713,12 +713,14 @@ namespace FineUIPro.Web.HSSE.Check this.drpCheckItem.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型 this.drpCheckItem.DataBind(); //this.drpCheckItem.SelectedValue = null; - ListItem[] item = new ListItem[4]; - - item[0] = new ListItem("低风险", "低"); - item[1] = new ListItem("一般风险", "一般"); - item[2] = new ListItem("较大风险", "较高"); - item[3] = new ListItem("重大风险", "高"); + ListItem[] item = new ListItem[3]; + item[0] = new ListItem("一般风险", "一般"); + item[1] = new ListItem("较大风险", "较高"); + item[2] = new ListItem("重大风险", "高"); + //item[0] = new ListItem("低风险", "低"); + //item[1] = new ListItem("一般风险", "一般"); + //item[2] = new ListItem("较大风险", "较高"); + //item[3] = new ListItem("重大风险", "高"); this.drpRiskLevel.DataValueField = "Value"; this.drpRiskLevel.DataTextField = "Text"; this.drpRiskLevel.DataSource = item;