风险分级管控清单改为文档式；安全防护验收新增检查人/检查时间并修复默认当前账号；实体重生成并移除旁路Code文件

- 风险分级管控清单(RiskControlList)由『一风险点一记录』明细结构改为文档式：工程名称(手输)/项目(绑定当前项目)/编制人/编制日期/附件/备注；新增 ProjectName/CompileMan/CompileDate 列(CREATE TABLE 脚本 2026-08-27-001)；BLL 映射、编辑页/列表页、菜单(CQMS)同步
- 安全防护验收(SafetyAcceptanceEdit)加入 检查人/检查时间，检查人默认当前登录账号并兜底不显示问题
- 重新生成 Model.cs(含 HSSE_RiskControlList 新列与 HSSE_SafetyPatrol.Code)，删除已由实体内置的旁路 HSSE_SafetyPatrol.Code.cs 及其 csproj 引用

DataBase/版本日志/SGGLDB_V2026-08-27-001-zones.sql

@@ -0,0 +1,176 @@
+-- =====================================================================
+-- 风险分级管控清单表：建表脚本（CREATE TABLE）
+-- 说明：原表为「一风险点一记录」的明细结构；本次改为「一份清单文档一记录」，
+--       新增 工程名称(手输 ProjectName)、编制人(存人名 CompileMan)、编制日期(CompileDate)。
+--       旧明细列(RiskName/RiskLevel/RiskType/ControlMeasure/ManagerUnit/ManagerMan)保留，仅停止使用。
+-- 幂等：若表已存在则跳过建表；列注释仅不存在时添加，可重复执行。
+--       若目标库已存在旧结构表，请先删除该表（或改用 ALTER ADD 增量脚本）再执行本脚本。
+-- =====================================================================
+
+-- 建表（表不存在才创建，含全部 13 列）
+IF OBJECT_ID(N'[dbo].[HSSE_RiskControlList]', N'U') IS NULL
+BEGIN
+    CREATE TABLE [dbo].[HSSE_RiskControlList] (
+        [RiskId]          nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL,
+        [ProjectId]       nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL,
+        [ProjectName]     nvarchar(200) COLLATE Chinese_PRC_CI_AS NULL,
+        [CompileMan]      nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
+        [CompileDate]     datetime NULL,
+        [RiskName]        nvarchar(200) COLLATE Chinese_PRC_CI_AS NULL,
+        [RiskLevel]       nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
+        [RiskType]        nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
+        [ControlMeasure]  nvarchar(1000) COLLATE Chinese_PRC_CI_AS NULL,
+        [ManagerUnit]     nvarchar(200) COLLATE Chinese_PRC_CI_AS NULL,
+        [ManagerMan]      nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL,
+        [Remark]          nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL,
+        [UploadFile]      nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL,
+        CONSTRAINT [PK_HSSE_RiskControlList] PRIMARY KEY CLUSTERED ([RiskId])
+    ) ON [PRIMARY];
+END
+GO
+
+-- 表注释
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = 0
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'风险分级管控清单',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_RiskControlList';
+GO
+
+-- 工程名称 中文注释
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'ProjectName', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'工程名称（手动输入）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_RiskControlList',
+    'COLUMN', N'ProjectName';
+GO
+
+-- 编制人 中文注释
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'CompileMan', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'编制人（存人名）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_RiskControlList',
+    'COLUMN', N'CompileMan';
+GO
+
+-- 编制日期 中文注释
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'CompileDate', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'编制日期',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_RiskControlList',
+    'COLUMN', N'CompileDate';
+GO
+
+-- 各旧列中文注释（与建表一致，供整表文档化）
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'RiskId', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'RiskId';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'ProjectId', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'项目', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'ProjectId';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'RiskName', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'风险点', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'RiskName';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'RiskLevel', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'风险等级', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'RiskLevel';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'RiskType', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'风险类别', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'RiskType';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'ControlMeasure', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'管控措施', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'ControlMeasure';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'ManagerUnit', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'责任单位', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'ManagerUnit';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'ManagerMan', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'责任人', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'ManagerMan';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'Remark', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'备注', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'Remark';
+GO
+
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_RiskControlList]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_RiskControlList]'), N'UploadFile', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty 'MS_Description', N'附件', 'SCHEMA', N'dbo', 'TABLE', N'HSSE_RiskControlList', 'COLUMN', N'UploadFile';
+GO

SGGL/BLL/HSSE/Hazard/RiskControlListService.cs

@@ -40,6 +40,9 @@ namespace BLL
             {
                 RiskId = item.RiskId,
                 ProjectId = item.ProjectId,
+                ProjectName = item.ProjectName,
+                CompileMan = item.CompileMan,
+                CompileDate = item.CompileDate,
                 RiskName = item.RiskName,
                 RiskLevel = item.RiskLevel,
                 RiskType = item.RiskType,
@@ -63,6 +66,9 @@ namespace BLL
             Model.HSSE_RiskControlList newItem = db.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == item.RiskId);
             if (newItem != null)
             {
+                newItem.ProjectName = item.ProjectName;
+                newItem.CompileMan = item.CompileMan;
+                newItem.CompileDate = item.CompileDate;
                 newItem.RiskName = item.RiskName;
                 newItem.RiskLevel = item.RiskLevel;
                 newItem.RiskType = item.RiskType;

SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx

@@ -17,25 +17,17 @@
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险分级管控清单" EnableCollapse="true"
                 runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="RiskId"
                 DataIDField="RiskId" AllowSorting="true"
-                SortField="RiskName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
                 IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
                 OnRowCommand="Grid1_RowCommand" EnableTextSelection="True">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:TextBox runat="server" Label="风险点" ID="txtRiskName" EmptyText="输入查询条件"
+                            <f:TextBox runat="server" Label="工程名称" ID="txtProjectName" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="220px" LabelAlign="right"
                                 LabelWidth="80px">
                             </f:TextBox>
-                            <f:DropDownList ID="ddlRiskLevel" runat="server" Label="等级" LabelAlign="right" LabelWidth="50px"
-                                Width="140px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                <f:ListItem Text="全部" Value="" />
-                                <f:ListItem Text="重大" Value="重大" />
-                                <f:ListItem Text="较大" Value="较大" />
-                                <f:ListItem Text="一般" Value="一般" />
-                                <f:ListItem Text="低" Value="低" />
-                            </f:DropDownList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
                             <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
@@ -50,33 +42,25 @@
                             <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                         </ItemTemplate>
                     </f:TemplateField>
-                    <f:RenderField Width="150px" ColumnID="RiskName" DataField="RiskName"
+                    <f:RenderField Width="260px" ColumnID="ProjectName" DataField="ProjectName"
-                        SortField="RiskName" FieldType="String" HeaderText="风险点" HeaderTextAlign="Center"
+                        SortField="ProjectName" FieldType="String" HeaderText="工程名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="80px" ColumnID="RiskLevel" DataField="RiskLevel"
-                        SortField="RiskLevel" FieldType="String" HeaderText="风险等级" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="RiskType" DataField="RiskType"
-                        SortField="RiskType" FieldType="String" HeaderText="风险类别" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="260px" ColumnID="ControlMeasure" DataField="ControlMeasure"
-                        SortField="ControlMeasure" FieldType="String" HeaderText="管控措施" HeaderTextAlign="Center"
                         TextAlign="Left" ExpandUnusedSpace="true">
                     </f:RenderField>
-                    <f:RenderField Width="140px" ColumnID="ManagerUnit" DataField="ManagerUnit"
+                    <f:RenderField Width="100px" ColumnID="CompileMan" DataField="CompileMan"
-                        SortField="ManagerUnit" FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
+                        SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
-                        TextAlign="Left">
+                        TextAlign="Center">
                     </f:RenderField>
-                    <f:RenderField Width="80px" ColumnID="ManagerMan" DataField="ManagerMan"
+                    <f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="ManagerMan" FieldType="String" HeaderText="责任人" HeaderTextAlign="Center"
+                        SortField="CompileDate" FieldType="Date" Renderer="Date" HeaderText="编制日期" HeaderTextAlign="Center"
                         TextAlign="Center">
                     </f:RenderField>
                     <f:LinkButtonField Width="80px" ColumnID="UploadFile" CommandName="attchUrl"
                         HeaderText="附件" HeaderTextAlign="Center" TextAlign="Center" Text="附件">
                     </f:LinkButtonField>
+                    <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark"
+                        SortField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
+                        TextAlign="Left">
+                    </f:RenderField>
                 </Columns>
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.cs

@@ -48,15 +48,11 @@ namespace FineUIPro.Web.HSSE.HazardousMG
                 return;
             }
             List<Model.HSSE_RiskControlList> list = BLL.RiskControlListService.GetList(this.CurrUser.LoginProjectId);
-            ////查询条件过滤
+            ////查询条件过滤：按工程名称
-            string name = this.txtRiskName.Text.Trim();
+            string name = this.txtProjectName.Text.Trim();
             if (!string.IsNullOrEmpty(name))
             {
-                list = list.Where(x => x.RiskName.Contains(name)).ToList();
+                list = list.Where(x => x.ProjectName != null && x.ProjectName.Contains(name)).ToList();
-            }
-            if (!string.IsNullOrEmpty(this.ddlRiskLevel.SelectedValue))
-            {
-                list = list.Where(x => x.RiskLevel == this.ddlRiskLevel.SelectedValue).ToList();
             }
             Grid1.RecordCount = list.Count;
             var table = this.GetPagedDataTable(Grid1, list);

SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.designer.cs

@@ -40,14 +40,9 @@ namespace FineUIPro.Web.HSSE.HazardousMG
         protected global::FineUIPro.Toolbar Toolbar1;
 
         /// <summary>
-        /// txtRiskName 控件。
+        /// txtProjectName 控件。
         /// </summary>
-        protected global::FineUIPro.TextBox txtRiskName;
+        protected global::FineUIPro.TextBox txtProjectName;
-
-        /// <summary>
-        /// ddlRiskLevel 控件。
-        /// </summary>
-        protected global::FineUIPro.DropDownList ddlRiskLevel;
 
         /// <summary>
         /// ToolbarFill1 控件。

SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx

@@ -16,40 +16,26 @@
         <Rows>
             <f:FormRow>
                 <Items>
-                    <f:TextBox ID="txtRiskName" runat="server" Label="风险点" LabelAlign="Right"
+                    <f:TextBox ID="txtProjectName" runat="server" Label="工程名称" LabelAlign="Right"
-                        MaxLength="100" Required="true" ShowRedStar="true" LabelWidth="90px">
+                        MaxLength="200" Required="true" ShowRedStar="true" LabelWidth="110px">
                     </f:TextBox>
                 </Items>
             </f:FormRow>
             <f:FormRow>
                 <Items>
-                    <f:DropDownList ID="ddlRiskLevel" runat="server" Label="风险等级" LabelAlign="Right"
+                    <f:TextBox ID="txtBindProject" runat="server" Label="项目" LabelAlign="Right"
-                        LabelWidth="90px" Required="true" ShowRedStar="true">
+                        Readonly="true" LabelWidth="110px">
-                        <f:ListItem Text="重大" Value="重大" />
+                    </f:TextBox>
-                        <f:ListItem Text="较大" Value="较大" />
+                    <f:DropDownList ID="ddlCompileMan" runat="server" Label="编制人" LabelAlign="Right"
-                        <f:ListItem Text="一般" Value="一般" />
+                        LabelWidth="110px" Required="true" ShowRedStar="true">
-                        <f:ListItem Text="低" Value="低" />
                     </f:DropDownList>
-                    <f:TextBox ID="txtRiskType" runat="server" Label="风险类别" LabelAlign="Right"
-                        MaxLength="50" LabelWidth="90px">
-                    </f:TextBox>
                 </Items>
             </f:FormRow>
             <f:FormRow>
                 <Items>
-                    <f:TextArea ID="txtControlMeasure" runat="server" Label="管控措施" LabelAlign="Right" Height="80px"
+                    <f:DatePicker ID="dpkCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
-                        MaxLength="500" Required="true" ShowRedStar="true" LabelWidth="90px">
+                        LabelWidth="110px" DateFormatString="yyyy-MM-dd" Required="true" ShowRedStar="true">
-                    </f:TextArea>
+                    </f:DatePicker>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtManagerUnit" runat="server" Label="责任单位" LabelAlign="Right"
-                        MaxLength="100" LabelWidth="90px">
-                    </f:TextBox>
-                    <f:TextBox ID="txtManagerMan" runat="server" Label="责任人" LabelAlign="Right"
-                        MaxLength="50" LabelWidth="90px">
-                    </f:TextBox>
                 </Items>
             </f:FormRow>
             <f:FormRow>
@@ -57,7 +43,7 @@
                     <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
                         <Items>
                             <f:Label ID="Label1" runat="server" ShowRedStar="true" Label="上传附件"
-                                LabelWidth="90px" LabelAlign="Right">
+                                LabelWidth="110px" LabelAlign="Right">
                             </f:Label>
                             <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                             </f:Button>
@@ -68,7 +54,7 @@
             <f:FormRow>
                 <Items>
                     <f:TextBox ID="txtRemark" runat="server" Label="备注" LabelAlign="Right"
-                        MaxLength="500" LabelWidth="90px">
+                        MaxLength="500" LabelWidth="110px">
                     </f:TextBox>
                 </Items>
             </f:FormRow>

SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.cs

@@ -35,6 +35,7 @@ namespace FineUIPro.Web.HSSE.HazardousMG
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.InitCompileMan();
                 this.RiskId = Request.Params["RiskId"];
                 if (!string.IsNullOrEmpty(this.RiskId))
                 {
@@ -42,17 +43,54 @@ namespace FineUIPro.Web.HSSE.HazardousMG
                     Model.HSSE_RiskControlList info = BLL.RiskControlListService.GetById(this.RiskId);
                     if (info != null)
                     {
-                        this.txtRiskName.Text = info.RiskName;
+                        this.txtProjectName.Text = info.ProjectName;
-                        this.ddlRiskLevel.SelectedValue = info.RiskLevel;
+                        this.txtBindProject.Text = BLL.ProjectService.GetProjectByProjectId(info.ProjectId).ProjectName;
-                        this.txtRiskType.Text = info.RiskType;
+                        ////编制人按人名回显；名称不在名单则追加原名称（保留旧数据）
-                        this.txtControlMeasure.Text = info.ControlMeasure;
+                        FineUIPro.ListItem item = this.ddlCompileMan.Items.FirstOrDefault(x => x.Text == info.CompileMan);
-                        this.txtManagerUnit.Text = info.ManagerUnit;
+                        if (item != null)
-                        this.txtManagerMan.Text = info.ManagerMan;
+                        {
+                            this.ddlCompileMan.SelectedValue = item.Value;
+                        }
+                        else if (!string.IsNullOrEmpty(info.CompileMan))
+                        {
+                            this.ddlCompileMan.Items.Insert(0, new FineUIPro.ListItem(info.CompileMan, ""));
+                            if (this.ddlCompileMan.Items.Count > 0)
+                            {
+                                this.ddlCompileMan.SelectedIndex = 0;
+                            }
+                        }
+                        this.dpkCompileDate.SelectedDate = info.CompileDate;
                         this.txtRemark.Text = info.Remark;
                     }
                 }
+                else
+                {
+                    ////新增：项目绑定当前登录项目，编制日期默认当天（编制人默认当前账号已在 InitCompileMan 中选中）
+                    this.txtBindProject.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
+                    this.dpkCompileDate.SelectedDate = DateTime.Now;
                 }
             }
+        }
+
+        /// <summary>
+        /// 初始化编制人下拉并默认当前登录账号。
+        /// 若当前账号不在项目用户名单（如管理账号未挂成员记录），追加到首位保证默认可选中。
+        /// </summary>
+        private void InitCompileMan()
+        {
+            if (this.CurrUser == null)
+            {
+                return;
+            }
+            BLL.UserService.InitUserDropDownList(this.ddlCompileMan, this.CurrUser.LoginProjectId, false);
+            ////当前账号不在下拉项中则追加到首位
+            bool found = this.ddlCompileMan.Items.Any(x => x.Value == this.CurrUser.UserId);
+            if (!found)
+            {
+                this.ddlCompileMan.Items.Insert(0, new FineUIPro.ListItem(this.CurrUser.UserName, this.CurrUser.UserId));
+            }
+            this.ddlCompileMan.SelectedValue = this.CurrUser.UserId;
+        }
         #endregion
 
         #region 保存
@@ -78,16 +116,15 @@ namespace FineUIPro.Web.HSSE.HazardousMG
                 Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
                 return;
             }
+            ////编制人取下拉选中项文本（存人名），无选中则为空
+            string compileManName = this.ddlCompileMan.SelectedItem == null ? string.Empty : this.ddlCompileMan.SelectedItem.Text.Trim();
             Model.HSSE_RiskControlList info = new Model.HSSE_RiskControlList
             {
                 RiskId = this.RiskId,
                 ProjectId = this.CurrUser.LoginProjectId,
-                RiskName = this.txtRiskName.Text.Trim(),
+                ProjectName = this.txtProjectName.Text.Trim(),
-                RiskLevel = this.ddlRiskLevel.SelectedValue,
+                CompileMan = compileManName,
-                RiskType = this.txtRiskType.Text.Trim(),
+                CompileDate = this.dpkCompileDate.SelectedDate,
-                ControlMeasure = this.txtControlMeasure.Text.Trim(),
-                ManagerUnit = this.txtManagerUnit.Text.Trim(),
-                ManagerMan = this.txtManagerMan.Text.Trim(),
                 Remark = this.txtRemark.Text.Trim()
             };
             ////存在则更新，不存在则新增（服务层已处理）

SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.designer.cs

@@ -45,34 +45,24 @@ namespace FineUIPro.Web.HSSE.HazardousMG
         protected global::FineUIPro.Button btnAttach;
 
         /// <summary>
-        /// txtRiskName 控件。
+        /// txtProjectName 控件。
         /// </summary>
-        protected global::FineUIPro.TextBox txtRiskName;
+        protected global::FineUIPro.TextBox txtProjectName;
 
         /// <summary>
-        /// ddlRiskLevel 控件。
+        /// txtBindProject 控件。
         /// </summary>
-        protected global::FineUIPro.DropDownList ddlRiskLevel;
+        protected global::FineUIPro.TextBox txtBindProject;
 
         /// <summary>
-        /// txtRiskType 控件。
+        /// ddlCompileMan 控件。
         /// </summary>
-        protected global::FineUIPro.TextBox txtRiskType;
+        protected global::FineUIPro.DropDownList ddlCompileMan;
 
         /// <summary>
-        /// txtControlMeasure 控件。
+        /// dpkCompileDate 控件。
         /// </summary>
-        protected global::FineUIPro.TextArea txtControlMeasure;
+        protected global::FineUIPro.DatePicker dpkCompileDate;
-
-        /// <summary>
-        /// txtManagerUnit 控件。
-        /// </summary>
-        protected global::FineUIPro.TextBox txtManagerUnit;
-
-        /// <summary>
-        /// txtManagerMan 控件。
-        /// </summary>
-        protected global::FineUIPro.TextBox txtManagerMan;
 
         /// <summary>
         /// txtRemark 控件。

SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx

@@ -51,11 +51,11 @@
                         TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="90px" ColumnID="AcceptanceMan" DataField="AcceptanceMan"
-                        SortField="AcceptanceMan" FieldType="String" HeaderText="验收人" HeaderTextAlign="Center"
+                        SortField="AcceptanceMan" FieldType="String" HeaderText="检查人" HeaderTextAlign="Center"
                         TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="120px" ColumnID="AcceptanceDate" DataField="AcceptanceDate"
-                        SortField="AcceptanceDate" FieldType="Date" Renderer="Date" HeaderText="验收时间" HeaderTextAlign="Center"
+                        SortField="AcceptanceDate" FieldType="Date" Renderer="Date" HeaderText="检查时间" HeaderTextAlign="Center"
                         TextAlign="Center">
                     </f:RenderField>
                     <f:LinkButtonField Width="80px" ColumnID="Attachment" CommandName="attchUrl"

SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx

@@ -31,6 +31,16 @@
                     </f:DropDownList>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlPatrolMan" runat="server" Label="检查人" LabelAlign="Right"
+                        LabelWidth="130px">
+                    </f:DropDownList>
+                    <f:DatePicker ID="dpPatrolDate" runat="server" Label="检查时间" LabelAlign="Right"
+                        LabelWidth="130px" DateFormatString="yyyy-MM-dd">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">

SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.cs

@@ -45,9 +45,15 @@ namespace FineUIPro.Web.HSSE.HazardousMG
                     {
                         this.ddlHazardProject.SelectedValue = info.HazardProjectId;
                         this.ddlAcceptanceResult.SelectedValue = info.AcceptanceResult;
+                        this.InitCheckMan(info.AcceptanceMan, info.AcceptanceDate);
                         this.txtRemark.Text = info.Remark;
                     }
                 }
+                else
+                {
+                    ////新增：检查人默认当前登录账号，检查时间默认当天
+                    this.InitCheckMan(null, null);
+                }
             }
         }
 
@@ -66,6 +72,57 @@ namespace FineUIPro.Web.HSSE.HazardousMG
                 this.ddlHazardProject.Items.Add(new FineUIPro.ListItem(p.ProjectName + "（" + p.ProjectCode + "）", p.HazardProjectId));
             }
         }
+
+        /// <summary>
+        /// 初始化检查人下拉并回显检查时间。新增默认当前登录账号、当天；编辑按名称回显。
+        /// </summary>
+        /// <param name="acceptanceMan">检查人名称（回显用，可为空）</param>
+        /// <param name="acceptanceDate">检查时间（回显用，可为空）</param>
+        private void InitCheckMan(string acceptanceMan, DateTime? acceptanceDate)
+        {
+            if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                return;
+            }
+            List<Model.Sys_User> users = BLL.UserService.GetProjectUserListByProjectId(this.CurrUser.LoginProjectId);
+            this.ddlPatrolMan.Items.Clear();
+
+            bool isNew = string.IsNullOrEmpty(acceptanceMan);
+            ////若当前登录账号不在项目用户名单（如管理账号未挂成员记录），追加到首位，
+            ////保证新增时“检查人”始终能显示并默认选中当前登录账号
+            bool currUserInList = users.Any(u => u.UserId == this.CurrUser.UserId || u.UserName == this.CurrUser.UserName);
+            if (!currUserInList)
+            {
+                this.ddlPatrolMan.Items.Add(new FineUIPro.ListItem(this.CurrUser.UserName, this.CurrUser.UserId));
+            }
+
+            ////新增且无回显名称：默认当前登录账号；编辑：按名称回显
+            string selectValue = isNew ? this.CurrUser.UserId : string.Empty;
+            foreach (Model.Sys_User u in users)
+            {
+                ////编辑：按名称回显
+                if (!isNew && string.IsNullOrEmpty(selectValue) && !string.IsNullOrEmpty(acceptanceMan) && u.UserName == acceptanceMan)
+                {
+                    selectValue = u.UserId;
+                }
+                this.ddlPatrolMan.Items.Add(new FineUIPro.ListItem(u.UserName, u.UserId));
+            }
+            ////名称在项目用户中找不到（如外部人员）：追加原名称选项，保留旧数据
+            if (!isNew && string.IsNullOrEmpty(selectValue) && !string.IsNullOrEmpty(acceptanceMan))
+            {
+                this.ddlPatrolMan.Items.Insert(0, new FineUIPro.ListItem(acceptanceMan, ""));
+            }
+            if (!string.IsNullOrEmpty(selectValue))
+            {
+                this.ddlPatrolMan.SelectedValue = selectValue;
+            }
+            else if (this.ddlPatrolMan.Items.Count > 0)
+            {
+                this.ddlPatrolMan.SelectedIndex = 0;
+            }
+            ////检查时间：有值回显，无值默认当天
+            this.dpPatrolDate.SelectedDate = acceptanceDate.HasValue ? acceptanceDate.Value : DateTime.Now;
+        }
         #endregion
 
         #region 保存
@@ -98,6 +155,9 @@ namespace FineUIPro.Web.HSSE.HazardousMG
             {
                 hazardProjectName = project.ProjectName;
             }
+            ////检查人名称：优先取下拉选中项文本；无选中则为空
+            string patrolManName = this.ddlPatrolMan.SelectedItem == null ? string.Empty : this.ddlPatrolMan.SelectedItem.Text.Trim();
+            DateTime? patrolDate = this.dpPatrolDate.SelectedDate;
             Model.HSSE_SafetyAcceptance info = new Model.HSSE_SafetyAcceptance
             {
                 AcceptanceId = this.AcceptanceId,
@@ -105,8 +165,8 @@ namespace FineUIPro.Web.HSSE.HazardousMG
                 HazardProjectId = this.ddlHazardProject.SelectedValue,
                 HazardProjectName = hazardProjectName,
                 AcceptanceResult = this.ddlAcceptanceResult.SelectedValue,
-                AcceptanceMan = this.CurrUser.UserName,
+                AcceptanceMan = patrolManName,
-                AcceptanceDate = DateTime.Now,
+                AcceptanceDate = patrolDate,
                 Remark = this.txtRemark.Text.Trim()
             };
             ////存在则更新，不存在则新增（服务层已处理）

SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.designer.cs

@@ -39,6 +39,16 @@ namespace FineUIPro.Web.HSSE.HazardousMG
         /// </summary>
         protected global::FineUIPro.DropDownList ddlAcceptanceResult;
 
+        /// <summary>
+        /// ddlPatrolMan 控件。
+        /// </summary>
+        protected global::FineUIPro.DropDownList ddlPatrolMan;
+
+        /// <summary>
+        /// dpPatrolDate 控件。
+        /// </summary>
+        protected global::FineUIPro.DatePicker dpPatrolDate;
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/Menu_CQMS.xml

@@ -13,6 +13,7 @@
 <TreeNode id="E85CB915-FAC3-4E59-82E7-28DD5525CCB0" Text="危大工程管控" EnText="危大工程管控" NavigateUrl=""><TreeNode id="0F166DE2-6DF7-49A9-8E4A-93F5AE476F28" Text="专项施工方案" EnText="专项施工方案" NavigateUrl="HSSE/HazardousMG/SpecialPlan.aspx"></TreeNode>
 <TreeNode id="1C0D9228-1548-47A8-9BC2-801CFED45915" Text="安全技术交底" EnText="安全技术交底" NavigateUrl="HSSE/HazardousMG/SafetyDisclosure.aspx"></TreeNode>
 <TreeNode id="44A8CF73-7F23-40CB-9D64-FD05AB48522D" Text="危大、超危清单" EnText="危大、超危清单" NavigateUrl="HSSE/HazardousMG/HazardProject.aspx"></TreeNode>
+<TreeNode id="39C36EF6-A11E-4EA1-B78C-E0F59AAA6EB7" Text="风险分级管控清单" EnText="风险分级管控清单" NavigateUrl="HSSE/HazardousMG/RiskControlList.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="WBS数据" EnText="WBS数据" NavigateUrl=""><TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" EnText="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
 </TreeNode>

SGGL/FineUIPro.Web/common/Menu_HSSE.xml

@@ -11,8 +11,8 @@
 <TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="日常巡检记录" EnText="日常巡检记录" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx"></TreeNode>
 <TreeNode id="C7481FEE-EA92-44B8-99F6-C5CA6BBDCFF5" Text="专项检查记录" EnText="专项检查记录" NavigateUrl="HSSE/Check/CheckSpecialRecord.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0" Text="危大工程管控" EnText="危大工程管控" NavigateUrl=""><TreeNode id="3EE924B8-DFB2-47DA-ADC1-FF8190E214F1" Text="安全巡检" EnText="安全巡检" NavigateUrl="HSSE/HazardousMG/SafetyPatrol.aspx"></TreeNode>
+<TreeNode id="81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0" Text="危大工程管控" EnText="危大工程管控" NavigateUrl=""><TreeNode id="3EE924B8-DFB2-47DA-ADC1-FF8190E214F1" Text="危大巡检" EnText="危大巡检" NavigateUrl="HSSE/HazardousMG/SafetyPatrol.aspx"></TreeNode>
-<TreeNode id="7962CE8E-C17C-4C50-962D-85687E2A2FC9" Text="安全防护验收" EnText="安全防护验收" NavigateUrl="HSSE/HazardousMG/SafetyAcceptance.aspx"></TreeNode>
+<TreeNode id="7962CE8E-C17C-4C50-962D-85687E2A2FC9" Text="危大防护验收" EnText="危大防护验收" NavigateUrl="HSSE/HazardousMG/SafetyAcceptance.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="安全会议" EnText="安全会议" NavigateUrl=""><TreeNode id="F8ADCDBC-AAAD-4884-9935-2B63562E4779" Text="班前会" EnText="班前会" NavigateUrl="HSSE/Meeting/ClassMeeting.aspx"></TreeNode>
 <TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="安全周例会" EnText="安全周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>

SGGL/Model/HSSE_SafetyPatrol.Code.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Data.Linq.Mapping;
-
-namespace Model
-{
-    /// <summary>
-    /// 【补充部分类】为 HSSE_SafetyPatrol 提供编码(Code) 列映射。
-    /// 说明：该列已由数据库脚本新增（见 DataBase/版本日志/SGGLDB_V2026-08-26-001-zones.sql），
-    ///       但本地无 SqlMetal，未通过 CreateModel.bat 重新生成 Model.cs，故以 partial 类补齐。
-    /// 注意：若以后用 CreateModel.bat 重新生成 Model.cs，SqlMetal 会把 Code 一并生成，
-    ///       届时请删除本文件，避免出现重复的 Code 成员导致编译错误。
-    /// </summary>
-    public partial class HSSE_SafetyPatrol
-    {
-        [Column(Name = "Code", DbType = "NVarChar(50)")]
-        public string Code { get; set; }
-    }
-}

SGGL/Model/Model.cs

@@ -219760,6 +219760,12 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private string _ProjectName;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
 		private string _RiskName;
 		
 		private string _RiskLevel;
@@ -219784,6 +219790,12 @@ namespace Model
     partial void OnRiskIdChanged();
     partial void OnProjectIdChanging(string value);
     partial void OnProjectIdChanged();
+    partial void OnProjectNameChanging(string value);
+    partial void OnProjectNameChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
     partial void OnRiskNameChanging(string value);
     partial void OnRiskNameChanged();
     partial void OnRiskLevelChanging(string value);
@@ -219847,6 +219859,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
+		public string ProjectName
+		{
+			get
+			{
+				return this._ProjectName;
+			}
+			set
+			{
+				if ((this._ProjectName != value))
+				{
+					this.OnProjectNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectName = value;
+					this.SendPropertyChanged("ProjectName");
+					this.OnProjectNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskName", DbType="NVarChar(200)")]
 		public string RiskName
 		{
@@ -220524,6 +220596,8 @@ namespace Model
 		
 		private string _Remarks;
 		
+		private string _Code;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -220558,6 +220632,8 @@ namespace Model
     partial void OnRectifyReviewChanged();
     partial void OnRemarksChanging(string value);
     partial void OnRemarksChanged();
+    partial void OnCodeChanging(string value);
+    partial void OnCodeChanged();
     #endregion
 		
 		public HSSE_SafetyPatrol()
@@ -220865,6 +220941,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
+		public string Code
+		{
+			get
+			{
+				return this._Code;
+			}
+			set
+			{
+				if ((this._Code != value))
+				{
+					this.OnCodeChanging(value);
+					this.SendPropertyChanging();
+					this._Code = value;
+					this.SendPropertyChanged("Code");
+					this.OnCodeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;

SGGL/Model/Model.csproj

@@ -247,7 +247,6 @@
     <Compile Include="JDGL\WBSSetInitItem.cs" />
     <Compile Include="JDGL\WBSSetItem.cs" />
     <Compile Include="Model.cs" />
-    <Compile Include="HSSE_SafetyPatrol.Code.cs" />
     <Compile Include="ModelProc.cs" />
     <Compile Include="Num.cs" />
     <Compile Include="Pie.cs" />