From 5dd16e8bf79b88ed760296e2c6e489533e39358d Mon Sep 17 00:00:00 2001 From: Frane Date: Tue, 1 Mar 2022 10:38:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20220301=20=E8=80=83=E5=8B=A4=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/BoSheng/BOSHENGMonitorService.cs | 5 +- .../HSSE/SitePerson/PersonInfoIn.aspx.cs | 51 +++++++++---------- .../ZHGL/RealName/SynchroSet.aspx.cs | 8 +-- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs index 196c9987..f5a1aa7b 100644 --- a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs +++ b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs @@ -87,17 +87,18 @@ namespace BLL string type = obj["Type"].ToString(); string code = obj["Code"].ToString(); string fromprojectId = obj["DepartId"].ToString(); + string OtherDepartId = obj["OtherDepartId"].ToString(); JArray arr = JArray.Parse(obj["Data"].ToString()); string projectId = string.Empty; ////根据传值项目主键 - var getProjectByFromProjectId = Funs.DB.Base_Project.FirstOrDefault(x => x.FromProjectId == fromprojectId); + var getProjectByFromProjectId = Funs.DB.Base_Project.FirstOrDefault(x => x.FromProjectId == fromprojectId && x.ProjectCode== OtherDepartId); if (getProjectByFromProjectId != null) { projectId = getProjectByFromProjectId.ProjectId; } else { - string OtherDepartId = obj["OtherDepartId"].ToString(); + var getPByCode= Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectCode == OtherDepartId); if (getPByCode != null) { diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs index a9136967..e89b665d 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs @@ -15,12 +15,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// 上传预设的虚拟路径 /// private string initPath = Const.ExcelUrl; - - /// - /// 人员考勤集合 - /// - public static List viewCheckings = new List(); - + /// /// 错误集合 /// @@ -54,11 +49,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { this.hdFileName.Text = string.Empty; this.hdCheckResult.Text = string.Empty; - this.ProjectId = this.CurrUser.LoginProjectId; - if (viewCheckings != null) - { - viewCheckings.Clear(); - } + this.ProjectId = this.CurrUser.LoginProjectId; errorInfos = string.Empty; } } @@ -84,11 +75,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning); return; - } - if (viewCheckings!=null) - { - viewCheckings.Clear(); - } + } if (!string.IsNullOrEmpty(errorInfos)) { errorInfos = string.Empty; @@ -171,8 +158,8 @@ namespace FineUIPro.Web.HSSE.SitePerson { var units = from x in Funs.DB.Base_Unit select x; var sitePersons = from x in Funs.DB.SitePerson_Person - where x.ProjectId == this.ProjectId select x; - + where x.ProjectId == this.ProjectId + select x; for (int i = 0; i < ir; i++) { string col0 = pds.Rows[i][0].ToString().Trim(); @@ -205,6 +192,12 @@ namespace FineUIPro.Web.HSSE.SitePerson { result += "第" + (i + 2).ToString() + "行," + "姓名" + "," + "[" + col1 + "]不在人员信息表中！" + "|"; } + + var personOut = sitePersons.FirstOrDefault(e => e.PersonName == col1 && e.OutTime.HasValue && e.OutTime < DateTime.Now); + if (personOut != null) + { + result += "第" + (i + 2).ToString() + "行," + "姓名" + "," + "[" + col1 + "]已离岗！" + "|"; + } } if (!string.IsNullOrEmpty(col2)) { @@ -335,6 +328,10 @@ namespace FineUIPro.Web.HSSE.SitePerson } } #endregion + /// + /// 人员考勤集合 + /// + public static List viewCheckings = new List(); #region 将Dataset的数据导入数据库 /// @@ -345,13 +342,13 @@ namespace FineUIPro.Web.HSSE.SitePerson /// private bool AddDatasetToSQL2(DataTable pds) { - viewCheckings.Clear(); + viewCheckings.Clear(); int ir = pds.Rows.Count; if (pds != null && ir > 0) - { - var units = from x in Funs.DB.Base_Unit select x; - var sitePersons = from x in Funs.DB.SitePerson_Person where x.ProjectId == this.ProjectId select x; - + { + var sitePersons = from x in Funs.DB.SitePerson_Person + where x.ProjectId == this.ProjectId && !x.OutTime.HasValue + select x; for (int i = 0; i < ir; i++) { string col0 = pds.Rows[i][0].ToString().Trim(); @@ -369,14 +366,14 @@ namespace FineUIPro.Web.HSSE.SitePerson IntoOut = col3 == "进" ? "1" : "0", IntoOutTime = Convert.ToDateTime(col4) }; - var person = BLL.PersonService.GetPersonByIdentityCard( this.ProjectId, checking.IdentityCard); + var person = sitePersons.FirstOrDefault(x => x.IdentityCard == checking.IdentityCard); if (person != null) { checking.PersonId = person.PersonId; checking.ProjectId = person.ProjectId; - } - checking.CheckingId = SQLHelper.GetNewID(); - viewCheckings.Add(checking); + checking.CheckingId = SQLHelper.GetNewID(); + viewCheckings.Add(checking); + } } } if (viewCheckings.Count > 0) diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs index 7def675e..6ffda2c4 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs @@ -262,7 +262,7 @@ namespace FineUIPro.Web.ZHGL.RealName if (!string.IsNullOrEmpty(idText)) { string proCode = ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue); - var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.JTproCode == proCode); + var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode); if (getRProjects != null && !string.IsNullOrEmpty(getRProjects.JTproCode)) { var getList = returnCardList(); @@ -418,7 +418,7 @@ namespace FineUIPro.Web.ZHGL.RealName int count = 0; string projectId = this.drpProject.SelectedValue; string proCode = ProjectService.GetJTProjectCodeByProjectId(projectId); - var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.JTproCode == proCode); + var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode); if (getRProjects != null && !string.IsNullOrEmpty(getRProjects.JTproCode)) { var getIdentityCards = (from x in Funs.DB.SitePerson_Person @@ -470,7 +470,7 @@ namespace FineUIPro.Web.ZHGL.RealName int count = 0; string projectId = this.drpProject.SelectedValue; string proCode = ProjectService.GetJTProjectCodeByProjectId(projectId); - var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.JTproCode == proCode); + var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode); if (getRProjects != null && !string.IsNullOrEmpty(getRProjects.JTproCode)) { var getIdentityCards = (from x in Funs.DB.SitePerson_Person @@ -515,7 +515,7 @@ namespace FineUIPro.Web.ZHGL.RealName string message = string.Empty; string projectId = this.drpProject.SelectedValue; string proCode = ProjectService.GetJTProjectCodeByProjectId(projectId); - var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.JTproCode == proCode); + var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode); if (getRProjects != null && !string.IsNullOrEmpty(getRProjects.JTproCode)) { message= SynchroSetService.updatePersonsExitTime(getRProjects.JTproCode); From 65dfdb13a99ed5498f75bad7f4383ef4dd8f02b8 Mon Sep 17 00:00:00 2001 From: Frane Date: Fri, 4 Mar 2022 16:15:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20220304=20=E8=80=83=E5=8B=A4=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E3=80=81=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SGGLDB_V2020-11-20-001.sql | 0 .../SGGLDB_V2020-11-24-001.sql | 0 .../SGGLDB_V2020-11-26-001.sql | 0 .../SGGLDB_V2020-11-30-001.sql | 0 .../SGGLDB_V2020-12-01-001.sql | 0 .../SGGLDB_V2020-12-01-001[实名制].sql | 0 .../SGGLDB_V2020-12-07-001.sql | 0 .../SGGLDB_V2020-12-07-001[实名制].sql | 0 .../SGGLDB_V2020-12-08-001[实名制].sql | 0 .../SGGLDB_V2020-12-09-001[实名制].sql | 0 .../SGGLDB_V2020-12-10-001.sql | 0 .../SGGLDB_V2020-12-10-001[实名制].sql | 0 ...DB_V2020-12-15-001(插入基础信息).sql | 0 .../SGGLDB_V2020-12-15-001.sql | 0 .../SGGLDB_V2020-12-24-001.sql | 0 .../SGGLDB_V2021-01-05-001.sql | 0 .../SGGLDB_V2021-01-06-001.sql | 0 .../SGGLDB_V2021-01-09-001.sql | 0 .../SGGLDB_V2021-01-12-001.sql | 0 .../SGGLDB_V2021-01-13-001.sql | 0 .../SGGLDB_V2021-01-14-001.sql | 0 .../SGGLDB_V2021-01-15-001.sql | 0 .../SGGLDB_V2021-01-17-001.sql | 0 .../SGGLDB_V2021-01-19-001.sql | 0 .../SGGLDB_V2021-01-21-001.sql | 0 .../SGGLDB_V2021-02-02-001.sql | 0 .../SGGLDB_V2021-02-04-001.sql | 0 .../SGGLDB_V2021-02-08-001.sql | 0 .../SGGLDB_V2021-03-01-001.sql | 0 .../SGGLDB_V2021-03-04-001.sql | 0 .../SGGLDB_V2021-03-09-001.sql | 0 ...1-001(修正脚本-删除多余项目).sql | 0 .../SGGLDB_V2021-03-11-001.sql | 0 .../SGGLDB_V2021-03-12-001.sql | 0 .../SGGLDB_V2021-03-16-001.sql | 0 .../SGGLDB_V2021-03-16-002.sql | 0 .../SGGLDB_V2021-03-19-001.sql | 0 .../SGGLDB_V2021-03-20-001.sql | 0 .../SGGLDB_V2021-03-23-001.sql | 0 .../SGGLDB_V2021-04-03-001.sql | 0 .../SGGLDB_V2021-04-12-001.sql | 0 .../SGGLDB_V2021-04-19-001.sql | 0 .../SGGLDB_V2021-04-21-001.sql | 0 .../SGGLDB_V2021-04-24-001.sql | 0 .../SGGLDB_V2021-06-08-001.sql | 0 .../SGGLDB_V2021-06-08-002.sql | 0 .../SGGLDB_V2021-06-21-001.sql | 0 .../SGGLDB_V2021-06-25-001.sql | 0 .../SGGLDB_V2021-06-28-001.sql | 0 .../SGGLDB_V2021-06-29-001.sql | 0 .../SGGLDB_V2021-07-02-001.sql | 0 .../SGGLDB_V2021-07-08-001.sql | 0 .../SGGLDB_V2021-07-09-001.sql | 0 .../SGGLDB_V2021-07-09-002.sql | 0 .../SGGLDB_V2021-07-20-001.sql | 0 .../SGGLDB_V2021-07-23-001.sql | 0 .../SGGLDB_V2021-08-16-001.sql | 0 .../SGGLDB_V2021-08-18-001.sql | 0 .../SGGLDB_V2021-08-19-001.sql | 0 .../SGGLDB_V2021-08-29-001.sql | 0 .../SGGLDB_V2021-08-30-001.sql | 0 .../SGGLDB_V2021-09-07-001.sql | 0 .../SGGLDB_V2021-09-09-001.sql | 0 .../SGGLDB_V2021-09-15-001.sql | 0 .../SGGLDB_V2021-09-22-001.sql | 0 .../SGGLDB_V2021-10-02-001.sql | 0 .../SGGLDB_V2021-11-02-001.sql | 0 .../SGGLDB_V2021-11-11-001.sql | 0 .../SGGLDB_V2021-11-26-001.sql | 0 .../SGGLDB_V2021-12-01-001.sql | 0 ...2021-12-01-001（材料管理菜单）.sql | 0 .../SGGLDB_V2021-12-02-001.sql | 0 .../SGGLDB_V2021-12-03-001.sql | 0 ...3-001（集团安全检查及报表）.sql | 0 ...07-001(与博晟对接数据记录表).sql | 0 .../SGGLDB_V2021-12-07-001.sql | 0 .../SGGLDB_V2021-12-08-001.sql | 0 .../SGGLDB_V2021-12-10-001.sql | 0 .../SGGLDB_V2021-12-21-001.sql | 0 .../SGGLDB_V2022-03-01-001.sql | 3 ++ .../1-3安全管理（Menu_HSSE）.sql | 4 ++- .../HSSE/EduTrain/TestRecord.aspx.cs | 33 +++++++++++++---- .../HSSE/SitePerson/PersonInfoIn.aspx.cs | 35 +++++++++++-------- .../Controllers/DoorServerController.cs | 30 ++++++++++++---- 84 files changed, 76 insertions(+), 29 deletions(-) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-11-20-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-11-24-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-11-26-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-11-30-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-01-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-01-001[实名制].sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-07-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-07-001[实名制].sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-08-001[实名制].sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-09-001[实名制].sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-10-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-10-001[实名制].sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-15-001(插入基础信息).sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-15-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2020年度}/SGGLDB_V2020-12-24-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-05-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-06-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-09-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-12-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-13-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-14-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-15-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-17-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-19-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-01-21-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-02-02-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-02-04-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-02-08-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-01-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-04-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-09-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-11-001(修正脚本-删除多余项目).sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-11-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-12-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-16-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-16-002.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-19-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-20-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-03-23-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-04-03-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-04-12-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-04-19-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-04-21-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-04-24-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-06-08-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-06-08-002.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-06-21-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-06-25-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-06-28-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-06-29-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-07-02-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-07-08-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-07-09-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-07-09-002.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-07-20-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-07-23-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-08-16-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-08-18-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-08-19-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-08-29-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-08-30-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-09-07-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-09-09-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-09-15-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-09-22-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-10-02-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-11-02-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-11-11-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-11-26-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-01-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-01-001（材料管理菜单）.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-02-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-03-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-03-001（集团安全检查及报表）.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-07-001(与博晟对接数据记录表).sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-07-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-08-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-10-001.sql (100%) rename DataBase/版本日志/已更新脚本/{ => 2021年度}/SGGLDB_V2021-12-21-001.sql (100%) create mode 100644 DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-01-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-20-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-20-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-20-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-20-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-24-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-24-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-24-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-24-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-26-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-26-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-26-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-26-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-30-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-30-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-11-30-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-11-30-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-01-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-01-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-01-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-01-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-01-001[实名制].sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-01-001[实名制].sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-01-001[实名制].sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-01-001[实名制].sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-07-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-07-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-07-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-07-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-07-001[实名制].sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-07-001[实名制].sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-07-001[实名制].sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-07-001[实名制].sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-08-001[实名制].sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-08-001[实名制].sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-08-001[实名制].sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-08-001[实名制].sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-09-001[实名制].sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-09-001[实名制].sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-09-001[实名制].sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-09-001[实名制].sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-10-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-10-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-10-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-10-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-10-001[实名制].sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-10-001[实名制].sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-10-001[实名制].sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-10-001[实名制].sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-15-001(插入基础信息).sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-15-001(插入基础信息).sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-15-001(插入基础信息).sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-15-001(插入基础信息).sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-15-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-15-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-15-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-15-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-24-001.sql b/DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-24-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2020-12-24-001.sql rename to DataBase/版本日志/已更新脚本/2020年度/SGGLDB_V2020-12-24-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-05-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-05-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-05-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-05-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-06-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-06-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-06-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-06-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-09-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-09-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-09-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-09-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-12-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-12-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-12-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-12-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-13-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-13-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-13-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-13-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-14-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-14-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-14-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-14-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-15-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-15-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-15-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-15-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-17-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-17-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-17-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-17-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-19-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-19-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-19-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-19-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-21-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-21-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-01-21-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-01-21-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-02-02-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-02-02-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-02-02-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-02-02-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-02-04-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-02-04-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-02-04-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-02-04-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-02-08-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-02-08-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-02-08-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-02-08-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-01-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-01-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-01-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-01-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-04-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-04-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-04-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-04-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-09-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-09-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-09-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-09-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-11-001(修正脚本-删除多余项目).sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-11-001(修正脚本-删除多余项目).sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-11-001(修正脚本-删除多余项目).sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-11-001(修正脚本-删除多余项目).sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-11-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-11-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-11-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-11-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-12-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-12-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-12-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-12-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-16-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-16-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-16-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-16-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-16-002.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-16-002.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-16-002.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-16-002.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-19-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-19-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-19-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-19-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-20-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-20-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-20-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-20-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-23-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-23-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-03-23-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-03-23-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-03-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-03-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-03-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-03-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-12-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-12-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-12-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-12-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-19-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-19-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-19-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-19-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-21-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-21-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-21-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-21-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-24-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-24-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-24-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-04-24-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-08-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-08-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-08-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-08-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-08-002.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-08-002.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-08-002.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-08-002.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-21-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-21-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-21-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-21-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-25-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-25-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-25-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-25-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-28-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-28-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-28-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-28-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-29-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-29-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-06-29-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-06-29-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-02-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-02-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-02-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-02-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-08-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-08-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-08-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-08-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-09-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-09-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-09-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-09-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-09-002.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-09-002.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-09-002.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-09-002.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-20-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-20-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-20-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-20-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-23-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-23-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-07-23-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-07-23-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-16-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-16-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-16-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-16-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-18-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-18-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-19-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-19-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-19-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-19-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-29-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-29-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-29-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-29-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-30-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-30-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-30-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-08-30-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-07-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-07-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-07-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-07-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-09-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-09-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-09-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-09-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-15-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-15-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-15-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-15-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-22-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-22-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-09-22-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-09-22-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-10-02-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-10-02-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-10-02-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-10-02-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-11-02-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-11-02-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-11-02-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-11-02-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-11-11-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-11-11-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-11-11-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-11-11-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-11-26-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-11-26-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-11-26-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-11-26-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-01-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-01-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-01-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-01-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-01-001（材料管理菜单）.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-01-001（材料管理菜单）.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-01-001（材料管理菜单）.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-01-001（材料管理菜单）.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-02-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-02-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-02-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-02-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-03-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-03-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-03-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-03-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-03-001（集团安全检查及报表）.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-03-001（集团安全检查及报表）.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-03-001（集团安全检查及报表）.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-03-001（集团安全检查及报表）.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-07-001(与博晟对接数据记录表).sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-07-001(与博晟对接数据记录表).sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-07-001(与博晟对接数据记录表).sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-07-001(与博晟对接数据记录表).sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-07-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-07-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-07-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-07-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-08-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-08-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-08-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-08-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-10-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-10-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-10-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-10-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-21-001.sql b/DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-21-001.sql similarity index 100% rename from DataBase/版本日志/已更新脚本/SGGLDB_V2021-12-21-001.sql rename to DataBase/版本日志/已更新脚本/2021年度/SGGLDB_V2021-12-21-001.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-01-001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-01-001.sql new file mode 100644 index 00000000..b99917d5 --- /dev/null +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-01-001.sql @@ -0,0 +1,3 @@ +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('638B5540-73B8-4A6C-BBB7-81961CE7336B','0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A','ɾ',3) +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql index 61ae05b5..3b5776ad 100644 --- a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql +++ b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql @@ -513,7 +513,9 @@ GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A','Լ¼','HSSE/EduTrain/TestRecord.aspx',70,'6A0506EB-05CE-4BB3-9BA9-866389F01E1C','Menu_HSSE',0,1,1) GO - + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('638B5540-73B8-4A6C-BBB7-81961CE7336B','0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A','ɾ',3) + GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('6FF941C1-8A00-4A74-8111-C892FC30A8DA','ͳ','HSSE/EduTrain/TestStatistics.aspx',80,'6A0506EB-05CE-4BB3-9BA9-866389F01E1C','Menu_HSSE',0,1,1) GO diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs index d376be74..31153661 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.IO; +using System.Linq; using System.Text; namespace FineUIPro.Web.HSSE.EduTrain { @@ -22,11 +23,8 @@ namespace FineUIPro.Web.HSSE.EduTrain { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - if (this.CurrUser.UserId == BLL.Const.sysglyId) - { - this.btnMenuDelete.Hidden = false; - } - + ////权限按钮方法 + this.GetButtonPower(); ///更新没有结束时间且超时的考试记录 GetDataService.UpdateTestPlanStates(); // 绑定表格 @@ -127,7 +125,6 @@ namespace FineUIPro.Web.HSSE.EduTrain /// protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; BindGrid(); } @@ -138,7 +135,6 @@ namespace FineUIPro.Web.HSSE.EduTrain /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { - Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } @@ -301,6 +297,29 @@ namespace FineUIPro.Web.HSSE.EduTrain // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TestRecordPrint.aspx?TestRecordId={0}", Grid1.SelectedRowID, "编辑 - "), "考试试卷", 900, 650)); //} + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectTestRecordMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + protected void btnPrint_Click(object sender, EventArgs e) { if (Grid1.SelectedRowIndexArray.Length == 0) diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs index e89b665d..8615345a 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs @@ -185,20 +185,7 @@ namespace FineUIPro.Web.HSSE.SitePerson result += "第" + (i + 2).ToString() + "行," + "单位" + "," + "[" + col0 + "]不在单位表中！" + "|"; } } - if (!string.IsNullOrEmpty(col1)) - { - var person = sitePersons.FirstOrDefault(e => e.PersonName == col1); - if (person == null) - { - result += "第" + (i + 2).ToString() + "行," + "姓名" + "," + "[" + col1 + "]不在人员信息表中！" + "|"; - } - - var personOut = sitePersons.FirstOrDefault(e => e.PersonName == col1 && e.OutTime.HasValue && e.OutTime < DateTime.Now); - if (personOut != null) - { - result += "第" + (i + 2).ToString() + "行," + "姓名" + "," + "[" + col1 + "]已离岗！" + "|"; - } - } + if (!string.IsNullOrEmpty(col2)) { var person = sitePersons.FirstOrDefault(e => e.IdentityCard == col2); @@ -209,8 +196,26 @@ namespace FineUIPro.Web.HSSE.SitePerson } else { - result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "此项为必填项！" + "|"; + if (!string.IsNullOrEmpty(col1)) + { + var person = sitePersons.FirstOrDefault(e => e.PersonName == col1); + if (person == null) + { + result += "第" + (i + 2).ToString() + "行," + "姓名" + "," + "[" + col1 + "]不在人员信息表中！" + "|"; + } + + var personOut = sitePersons.FirstOrDefault(e => e.PersonName == col1 && (!e.OutTime.HasValue || e.OutTime > DateTime.Now)); + if (personOut == null) + { + result += "第" + (i + 2).ToString() + "行," + "姓名" + "," + "[" + col1 + "]不在岗！" + "|"; + } + } + else + { + result += "第" + (i + 2).ToString() + "行," + "身份证号码/姓名" + "," + "不能都为空！" + "|"; + } } + if (!string.IsNullOrEmpty(col3)) { if (col3 != "进" && col3 != "出") diff --git a/SGGL/WebAPI/Controllers/DoorServerController.cs b/SGGL/WebAPI/Controllers/DoorServerController.cs index 26400e68..cd7dd684 100644 --- a/SGGL/WebAPI/Controllers/DoorServerController.cs +++ b/SGGL/WebAPI/Controllers/DoorServerController.cs @@ -239,13 +239,31 @@ namespace WebAPI.Controllers { string projectId = facerecord.ProjectId; string personName = facerecord.EmployName; - var getPersonByIdCard = db.SitePerson_Person.Where(x => x.IdentityCard == facerecord.EmployNO).OrderByDescending(x => x.InTime).FirstOrDefault(); - if (getPersonByIdCard != null) - { - personName = getPersonByIdCard.PersonName; - projectId = getPersonByIdCard.ProjectId; - } + string ProjectId_19261 = "1be62038-2b94-4ac2-9b5f-80cef85deeb2"; + string ProjectId_20041 = "e9fe4b89-f62d-4b3a-a40c-57c87010aa92"; + if (projectId == ProjectId_19261 || projectId == ProjectId_20041) + { + var getPersonByIdCard = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == facerecord.EmployNO && (x.ProjectId == ProjectId_19261 || x.ProjectId == ProjectId_20041) && !x.OutTime.HasValue); + if (getPersonByIdCard != null) + { + personName = getPersonByIdCard.PersonName; + projectId = getPersonByIdCard.ProjectId; + } + } + + string ProjectId_20197 = "310e790e-5ede-4345-98a4-8bd0866e69ef"; + string ProjectId_21126 = "a7f692aa-4bd5-4fb3-87f8-ba1ab8f94cc2"; + if (projectId == ProjectId_20197 || projectId == ProjectId_21126) + { + var getPersonByIdCard = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == facerecord.EmployNO && (x.ProjectId == ProjectId_20197 || x.ProjectId == ProjectId_21126) && !x.OutTime.HasValue); + if (getPersonByIdCard != null) + { + personName = getPersonByIdCard.PersonName; + projectId = getPersonByIdCard.ProjectId; + } + } + var getFacerecord = db.T_d_facerecord.FirstOrDefault(x => x.ID == facerecord.ID && x.ProjectId == projectId && x.RoleID == facerecord.RoleID); if (getFacerecord == null) {