Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

DataBase/ConstInitData.sql

@@ -538,36 +538,40 @@ GO
 --GO
 
 /*项目*/
+
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
 VALUES('D097252D-B42A-4CAE-9030-A5C351057ABD','Menu_ProjectSet','项目设置',1,'MenuType_P')
 GO
-INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
-VALUES('E116D85E-6215-4299-9EEA-FBC46B0E6163','Menu_CQMS','质量管理',2,'MenuType_P')
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId) 
+VALUES('CF2CA03F-84B3-432E-AEAC-4ECF7890D6D7','Menu_PZHGL','施工管理',2,'MenuType_P')
 GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
-VALUES('35282E20-81AB-4DA2-80F2-8F136776642D','Menu_HSSE','安全管理',3,'MenuType_P')
+VALUES('E116D85E-6215-4299-9EEA-FBC46B0E6163','Menu_CQMS','质量管理',3,'MenuType_P')
 GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
-VALUES('B4F6F0B8-C7AD-421A-9BE3-DCC70EB39A8C','Menu_JDGL','进度管理',4,'MenuType_P')
+VALUES('B4F6F0B8-C7AD-421A-9BE3-DCC70EB39A8C','Menu_JDGL','进度/计划',4,'MenuType_P')
 GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
-VALUES('CE689095-841F-4714-A2B4-BF72D13E2B94','Menu_HJGL','焊接管理',5,'MenuType_P')
+VALUES('35282E20-81AB-4DA2-80F2-8F136776642D','Menu_HSSE','HSE管理',5,'MenuType_P')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
+VALUES('CE689095-841F-4714-A2B4-BF72D13E2B94','Menu_HJGL','焊接管理',6,'MenuType_P')
 GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId) 
-VALUES('7AD04F82-91B3-4579-993C-8C8FAC503864','Menu_TestRun','试车管理',6,'MenuType_P')
-GO
-INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId) 
-VALUES('CF2CA03F-84B3-432E-AEAC-4ECF7890D6D7','Menu_PZHGL','施工综合',7,'MenuType_P')
+VALUES('7AD04F82-91B3-4579-993C-8C8FAC503864','Menu_TestRun','试车管理',7,'MenuType_P')
 GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
-VALUES('85CF0BBF-A3F3-42DF-89DC-CE9A4886BCA1','Menu_DigitalSite','视频监控',8,'MenuType_P')
+VALUES('126FB0AC-521C-4145-86FC-B507D83B7646','Menu_Change','变更管理',8,'MenuType_P')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
+VALUES('C0457DFF-AAA3-4019-AC9B-34BF22BF3A0E','Menu_DocControl','文控管理',9,'MenuType_P')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
+VALUES('0B13D4A9-E047-4C18-AD68-8D3724D4F0A8','Menu_Attendance','现场考勤',10,'MenuType_P')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
+VALUES('85CF0BBF-A3F3-42DF-89DC-CE9A4886BCA1','Menu_Video','视频监控',11,'MenuType_P')
 GO
---INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
---VALUES('0B13D4A9-E047-4C18-AD68-8D3724D4F0A8','Menu_Video','现场考勤',9,'MenuType_P')
---GO
---INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
---VALUES('69B856E6-E385-4771-9341-23E7416C46F1','Menu_PDigData','项目考勤',9,'MenuType_P')
---GO
 
 --项目类型
 INSERT INTO dbo.Sys_Const(ID, ConstValue, ConstText, SortIndex, GroupId)

DataBase/版本日志/已更新脚本/SGGLDB_V2022-07-26-001.sql

@@ -0,0 +1,4 @@
+ALTER TABLE SitePerson_Person ADD RawPassword NVARCHAR(100) NULL
+GO
+ALTER TABLE Sys_user ADD RawPassword NVARCHAR(100) NULL
+GO

DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-01-001(数据修正脚本).sql

@@ -0,0 +1,9 @@
+ -- 重置双氧水项目人员下发状态 为空
+disable trigger [dbo].[SitePerson_Person_Bak_TRIGGER] on [dbo].[SitePerson_Person]
+go
+update SitePerson_Person set ExchangeTime=null,ExchangeTime2=null where ProjectId='0d511d27-c4ea-49ba-bd75-7b1c49a04382'
+go
+update SitePerson_Person_Bak set ExchangeTime=null,ExchangeTime2=null where ProjectId='0d511d27-c4ea-49ba-bd75-7b1c49a04382'
+go
+enable trigger [dbo].[SitePerson_Person_Bak_TRIGGER] on [dbo].[SitePerson_Person]
+go

DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-04-001修改明细.txt

@@ -0,0 +1,4 @@
+--ADD BY YangHongwei 2022-08-04
+1、宏宜项目（许洪涛）：考勤月记录校正数据方法优化。
+2、现场人员同步门禁状态重置按钮功能实现。
+--END

DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-29-001.sql

@@ -0,0 +1,4 @@
+ALTER TABLE [dbo].[EduTrain_TrainRecord] DROP CONSTRAINT [FK_EduTrain_TrainRecord_Training_Plan]
+GO
+
+

DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-29-001修改明细.txt

@@ -0,0 +1,3 @@
+--ADD BY YangHongwei 2022-08-29
+1、旭科项目（张英魁）处理未做培训计划，直接按照考试计划考试的情况，新增按钮，手动将这部分考试记录归到到培训记录中。
+--END