From 5dd16e8bf79b88ed760296e2c6e489533e39358d Mon Sep 17 00:00:00 2001 From: Frane Date: Tue, 1 Mar 2022 10:38:44 +0800 Subject: [PATCH] =?UTF-8?q?20220301=20=E8=80=83=E5=8B=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=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);