zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

实名制对接

This commit is contained in:
李超 2023-03-17 14:06:12 +08:00
parent 8a17cb692a
commit c37a207bfe
5 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -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);
}
/// <summary>

2
SGGL/Model/APIItem/HSSE/PersonItem.cs
View File

@ -47,6 +47,8 @@ namespace Model
/// 项目号
/// </summary>
public string ProjectCode { get; set; }
public string ProjectNum { get; set; }
/// <summary>
/// 项目名称
/// </summary>

8
SGGL/Model/DoorServer/RealNamePersonItem.cs
View File

@ -15,6 +15,14 @@ namespace Model
/// 项目号
/// </summary>
public string projectCode
{
get;
set;
}
/// <summary>
/// 项目号
/// </summary>
public string projectNum
{
get;
set;

5
SGGL/Model/DoorServer/attendanceItem.cs
View File

@ -26,6 +26,11 @@ namespace Model
get;
set;
}
public string ProjectNum
{
get;
set;
}
/// <summary>
/// 设备序列号
/// </summary>

35
SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
View File

@ -31,13 +31,13 @@ namespace WebAPI.Controllers
if (records != null && records.records.Count() > 0)
{
List<Model.attendanceItem> 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
/// <summary>
/// 获取在岗人员
/// </summary>
/// <param name="projectCode"></param>
/// <param name="projectNum"></param>
/// <returns></returns>
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 获取离场人员
/// <summary>
/// 获取离场人员
/// </summary>
/// <param name="projectCode"></param>
/// <param name="projectNum"></param>
/// <returns></returns>
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
/// <summary>
/// 获取人员出入场记录
/// </summary>
/// <param name="projectCode"></param>
/// <param name="projectNum"></param>
/// <param name="idCard"></param>
/// <param name="isIn"></param>
/// <param name="changeTime"></param>
/// <returns></returns>
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
/// </summary>
/// <param name="projectCode"></param>
/// <returns></returns>
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
/// <param name="idCard"></param>
/// <param name="type"></param>
/// <returns></returns>
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);