From 9bce0d340fd1dbc69801be91610f179b3d52d063 Mon Sep 17 00:00:00 2001
From: Zones <765289303@qq.com>
Date: Fri, 4 Sep 2026 14:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CreateModel.bat                               | 16 +++---
 .../版本日志/SGGLDB_V2026-08-25-002-zones.sql | 54 +++++++++++++++++++
 .../版本日志/SGGLDB_V2026-08-26-001-zones.sql | 53 ++++++++++++++++++
 ...e_HSSE_SafetyPatrol_DropPatrolLocation.sql | 35 ++++++++++++
 _fineui.css                                   |  1 +
 5 files changed, 151 insertions(+), 8 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-25-002-zones.sql
 create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-26-001-zones.sql
 create mode 100644 SGGL/DataBase_HSSE_SafetyPatrol_DropPatrolLocation.sql
 create mode 100644 _fineui.css

diff --git a/CreateModel.bat b/CreateModel.bat
index f3db9c1..022d416 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -1,33 +1,33 @@
 @echo off
 REM ---------------
-REM ���������ɹ���
-REM ִ�д��ļ�ǰ������Release����WebOA��Ŀ
+REM ���������ɹ���
+REM ִ�д��ļ�ǰ������Release����WebOA��Ŀ
 REM --------------
 
 
 
 REM --------------
-REM ������������ Project_SrcΪ��WebOA�����ķ�֧
+REM ������������ Project_SrcΪ��WebOA�����ķ�֧
 REM --------------
 set PROJECT_SRC=%CD%
 cd..
 
-REM Դ����Model��Ŀ�ļ���
+REM Դ����Model��Ŀ�ļ���
 set Model_ROOT=%PROJECT_SRC%\SGGL\Model
 
 
 REM --------------
-REM ����������ļ������
+REM ����������ļ������
 REM --------------
 
 
 
 
-@echo ����.net����̨����
+@echo ����.net����̨����
 @echo.
 @call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:.\SQL2022 /database:SGGLDB_HBAZ /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:DESKTOP-B3C9LJ1 /user:sa /password:303303 /database:SGGLDB_HBAZ /code:%Model_ROOT%\Model.cs /namespace:Model
 
-@ECHO ���
+@ECHO ���
 pause
diff --git a/DataBase/版本日志/SGGLDB_V2026-08-25-002-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-25-002-zones.sql
new file mode 100644
index 0000000..e373595
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2026-08-25-002-zones.sql
@@ -0,0 +1,54 @@
+-- =====================================================================
+-- 安全巡检记录表：增加 巡检人ID、签收人ID
+-- 说明：巡检人名称(PatrolMan)、签收人名称(Receiver)列已存在，忽略。
+--       本次仅补齐 巡检人ID(PatrolManId)、签收人ID(ReceiverId)。
+-- 幂等：若列已存在则跳过（存在忽略，不存在则加入），可重复执行。
+-- =====================================================================
+
+-- 巡检人ID
+IF NOT EXISTS (
+    SELECT 1 FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]') AND name = N'PatrolManId'
+)
+BEGIN
+    ALTER TABLE [dbo].[HSSE_SafetyPatrol] ADD [PatrolManId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL;
+END
+GO
+
+-- 签收人ID
+IF NOT EXISTS (
+    SELECT 1 FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]') AND name = N'ReceiverId'
+)
+BEGIN
+    ALTER TABLE [dbo].[HSSE_SafetyPatrol] ADD [ReceiverId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL;
+END
+GO
+
+-- 巡检人ID 中文注释（幂等：注释不存在才添加）
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]'), N'PatrolManId', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'巡检人ID',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_SafetyPatrol',
+    'COLUMN', N'PatrolManId';
+GO
+
+-- 签收人ID 中文注释（幂等：注释不存在才添加）
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]'), N'ReceiverId', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'签收人ID',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_SafetyPatrol',
+    'COLUMN', N'ReceiverId';
+GO
diff --git a/DataBase/版本日志/SGGLDB_V2026-08-26-001-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-26-001-zones.sql
new file mode 100644
index 0000000..c08c589
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2026-08-26-001-zones.sql
@@ -0,0 +1,53 @@
+-- =====================================================================
+-- 安全巡检记录表：增加 编码(Code) 字段
+-- 说明：编码全局唯一（前缀 XJ- + 三位递增序号，如 XJ-001）。
+--       移动端/桌面端新增时由服务自动生成，编码不可重复。
+-- 幂等：若列已存在则跳过；若唯一索引已存在则跳过，可重复执行。
+-- =====================================================================
+
+-- 编码列
+IF NOT EXISTS (
+    SELECT 1 FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]') AND name = N'Code'
+)
+BEGIN
+    ALTER TABLE [dbo].[HSSE_SafetyPatrol] ADD [Code] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL;
+END
+GO
+
+-- 为已有记录回填编码（按巡检日期升序，序号从 1 开始，前缀 XJ-）
+UPDATE c
+SET c.Code = N'XJ-' + FORMAT(t.rn, 'D3')
+FROM [dbo].[HSSE_SafetyPatrol] c
+INNER JOIN (
+    SELECT PatrolId,
+           ROW_NUMBER() OVER (ORDER BY PatrolDate, PatrolId) AS rn
+    FROM [dbo].[HSSE_SafetyPatrol]
+    WHERE Code IS NULL
+) t ON c.PatrolId = t.PatrolId;
+GO
+
+-- 编码唯一索引
+IF NOT EXISTS (
+    SELECT 1 FROM sys.indexes
+    WHERE object_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]') AND name = N'UX_HSSE_SafetyPatrol_Code'
+)
+BEGIN
+    CREATE UNIQUE INDEX [UX_HSSE_SafetyPatrol_Code]
+        ON [dbo].[HSSE_SafetyPatrol] ([Code]);
+END
+GO
+
+-- 编码 中文注释（幂等：注释不存在才添加）
+IF NOT EXISTS (
+    SELECT 1 FROM sys.extended_properties
+    WHERE major_id = OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]')
+      AND minor_id = COLUMNPROPERTY(OBJECT_ID(N'[dbo].[HSSE_SafetyPatrol]'), N'Code', 'ColumnId')
+      AND name = N'MS_Description'
+)
+    EXEC sp_addextendedproperty
+    'MS_Description', N'编码（全局唯一，格式 XJ-序号，自动生成）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'HSSE_SafetyPatrol',
+    'COLUMN', N'Code';
+GO
diff --git a/SGGL/DataBase_HSSE_SafetyPatrol_DropPatrolLocation.sql b/SGGL/DataBase_HSSE_SafetyPatrol_DropPatrolLocation.sql
new file mode 100644
index 0000000..1f1c047
--- /dev/null
+++ b/SGGL/DataBase_HSSE_SafetyPatrol_DropPatrolLocation.sql
@@ -0,0 +1,35 @@
+-- =====================================================================
+-- 安全巡检：工程名称 = 监督巡视部位，移除冗余字段 PatrolLocation
+-- 背景：`监督巡视部位` 实际取自危大超危工程（HazardProjectName），
+--       与 `工程名称` 为同一概念。PC 端/小程序均已下拉选择危大超危工程。
+--       原表冗余保存 PatrolLocation，且其值恒等于 HazardProjectName。
+-- 影响：本脚本删除 dbo.HSSE_SafetyPatrol.PatrolLocation 列。
+--       因该列历史值与 HazardProjectName 相同，删除不丢失有效信息。
+-- 执行前请先备份数据库。
+-- =====================================================================
+
+USE [SGGLDB]
+GO
+
+-- 1) 校验：该列是否与工程名称冗余（值均等于 HazardProjectName）；如返回 >0 请先人工确认
+SELECT COUNT(*) AS OTHERS
+FROM dbo.HSSE_SafetyPatrol
+WHERE ISNULL(PatrolLocation, '') <> ISNULL(HazardProjectName, '')
+
+-- 2) 动态删除该列上的默认值约束（如存在）
+GO
+DECLARE @df NVARCHAR(200)
+SELECT @df = dc.name
+FROM sys.default_constraints dc
+INNER JOIN sys.columns c ON c.object_id = dc.parent_object_id AND c.column_id = dc.parent_column_id
+WHERE dc.parent_object_id = OBJECT_ID('dbo.HSSE_SafetyPatrol') AND c.name = 'PatrolLocation'
+IF @df IS NOT NULL
+BEGIN
+    EXEC(N'ALTER TABLE [dbo].[HSSE_SafetyPatrol] DROP CONSTRAINT [' + @df + N']')
+END
+
+-- 3) 删除冗余列
+GO
+ALTER TABLE [dbo].[HSSE_SafetyPatrol]
+DROP COLUMN [PatrolLocation]
+GO
diff --git a/_fineui.css b/_fineui.css
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/_fineui.css
@@ -0,0 +1 @@
+
\ No newline at end of file