diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index b8b6db0f..d792d077 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -19,7 +19,7 @@ } public static Model.Base_Project GetProjectByProjectCode(string code) { - return Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectCode == code); + return Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectCode == code || e.ProjectNum==code); } /// diff --git a/SGGL/Model/APIItem/HSSE/PersonItem.cs b/SGGL/Model/APIItem/HSSE/PersonItem.cs index 5df92ac2..b549f141 100644 --- a/SGGL/Model/APIItem/HSSE/PersonItem.cs +++ b/SGGL/Model/APIItem/HSSE/PersonItem.cs @@ -47,6 +47,8 @@ namespace Model /// 项目号 /// public string ProjectCode { get; set; } + public string ProjectNum { get; set; } + /// /// 项目名称 /// diff --git a/SGGL/Model/DoorServer/RealNamePersonItem.cs b/SGGL/Model/DoorServer/RealNamePersonItem.cs index 7910e370..fd0d0665 100644 --- a/SGGL/Model/DoorServer/RealNamePersonItem.cs +++ b/SGGL/Model/DoorServer/RealNamePersonItem.cs @@ -15,6 +15,14 @@ namespace Model /// 项目号 /// public string projectCode + { + get; + set; + } + /// + /// 项目号 + /// + public string projectNum { get; set; diff --git a/SGGL/Model/DoorServer/attendanceItem.cs b/SGGL/Model/DoorServer/attendanceItem.cs index 504e5a27..9a0efeda 100644 --- a/SGGL/Model/DoorServer/attendanceItem.cs +++ b/SGGL/Model/DoorServer/attendanceItem.cs @@ -26,6 +26,11 @@ namespace Model get; set; } + public string ProjectNum + { + get; + set; + } /// /// 设备序列号 /// diff --git a/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs b/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs index 8424b1cd..d8e27223 100644 --- a/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs +++ b/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs @@ -31,13 +31,13 @@ namespace WebAPI.Controllers if (records != null && records.records.Count() > 0) { List attendanceItems = records.records; - var getprojectCode = attendanceItems.FirstOrDefault(x => x.ProjectCode != null || x.ProjectId != null); + var getprojectCode = attendanceItems.FirstOrDefault(x => x.ProjectNum != null || x.ProjectId != null); if (getprojectCode != null) { string projectId = getprojectCode.ProjectId; if (string.IsNullOrEmpty(projectId)) { - var getProject = ProjectService.GetProjectByProjectCode(getprojectCode.ProjectCode); + var getProject = ProjectService.GetProjectByProjectCode(getprojectCode.ProjectNum); if (getProject != null) { projectId = getProject.ProjectId; @@ -151,7 +151,7 @@ namespace WebAPI.Controllers { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var getProject = ProjectService.GetProjectByProjectCode(person.ProjectCode); + var getProject = ProjectService.GetProjectByProjectCode(person.ProjectNum); if (getProject != null) { var getUnit = UnitService.getUnitByCollCropCodeUnitName(person.CollCropCode, person.UnitName); @@ -315,14 +315,14 @@ namespace WebAPI.Controllers /// /// 获取在岗人员 /// - /// + /// /// - public Model.ResponeData getPersons(string projectCode) + public Model.ResponeData getPersons(string projectNum) { var responeData = new Model.ResponeData(); try { - var getProject = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode); + var getProject = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectNum == projectNum); if (getProject != null) { responeData.data = from x in Funs.DB.SitePerson_Person @@ -372,21 +372,21 @@ namespace WebAPI.Controllers } #endregion - + #region 获取离场人员 /// /// 获取离场人员 /// - /// + /// /// - public Model.ResponeData getOutWorkPersons(string projectCode) + public Model.ResponeData getOutWorkPersons(string projectNum) { var responeData = new Model.ResponeData(); try { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode); + var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectNum == projectNum); if (getProject != null) { responeData.data = (from x in db.SitePerson_Person @@ -417,17 +417,17 @@ namespace WebAPI.Controllers /// /// 获取人员出入场记录 /// - /// + /// /// /// /// /// - public Model.ResponeData getPersonInOut(string projectCode, string idCard, int isIn, DateTime changeTime) + public Model.ResponeData getPersonInOut(string projectNum, string idCard, int isIn, DateTime changeTime) { var responeData = new Model.ResponeData(); try { - var getProject = ProjectService.GetProjectByProjectCode(projectCode); + var getProject = ProjectService.GetProjectByProjectCode(projectNum); if (getProject != null) { Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut @@ -458,14 +458,14 @@ namespace WebAPI.Controllers /// /// /// - public Model.ResponeData getRealNamePersons(string projectCode) + public Model.ResponeData getRealNamePersons(string projectNum) { var responeData = new Model.ResponeData(); try { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode); + var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectNum == projectNum); if (getProject != null) { responeData.data = (from x in db.SitePerson_Person @@ -481,6 +481,7 @@ namespace WebAPI.Controllers { projectCode = getProject.ProjectCode, projectName = getProject.ProjectName, + projectNum = getProject.ProjectNum, unitName = y.UnitName, collCropCode = y.CollCropCode, teamGroupName = T.TeamGroupName, @@ -538,14 +539,14 @@ namespace WebAPI.Controllers /// /// /// - public Model.ResponeData getUpdatePersonExchangeTime(string projectCode, string idCard, string type) + public Model.ResponeData getUpdatePersonExchangeTime(string projectNum, string idCard, string type) { var responeData = new Model.ResponeData(); try { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode); + var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectNum == projectNum); if (getProject != null) { var getPerson = db.SitePerson_Person.FirstOrDefault(e => e.ProjectId == getProject.ProjectId && e.IdentityCard == idCard);