lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加考勤对接需要人员接口和考勤记录接口

Browse Source
This commit is contained in:
李鹏飞
2025-12-24 16:27:07 +08:00
parent 26b921cab2
commit 8ccc25e074
6 changed files with 289 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIPersonService.cs
+58 -23
View File
@@ -299,7 +299,7 @@ namespace BLL
/// </summary>
/// <param name="filter">查询过滤条件</param>
/// <returns></returns>
public static List<Model.PersonItem> getPersonByFilter(Model.ProjectPersonInput filter)
public static List<Model.ProjectPersonOutput> getPersonByFilter(Model.ProjectPersonInput filter)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -315,6 +315,12 @@ namespace BLL
query = query.Where(x => x.ProjectId == filter.ProjectId);
}
// 项目名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.ProjectName))
{
query = query.Where(x => x.ProjectName.Contains(filter.ProjectName));
}
// 人员ID过滤
if (!string.IsNullOrEmpty(filter.PersonId))
{
@@ -361,44 +367,26 @@ namespace BLL
if (!string.IsNullOrEmpty(filter.WorkPostName))
{
query = query.Where(x => x.WorkPostName.Contains(filter.WorkPostName));
}
// 性别过滤
if (!string.IsNullOrEmpty(filter.Sex))
{
query = query.Where(x => x.Sex == filter.Sex);
}
// 电话号码过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.Telephone))
{
query = query.Where(x => x.Telephone.Contains(filter.Telephone));
}
}
}
// 默认只返回在岗人员
query = query.Where(x => x.States == Const.ProjectPersonStates_1);
var persons = from x in query orderby x.CardNo descending
select new Model.PersonItem
select new Model.ProjectPersonOutput
{
PersonId = x.PersonId,
SitePersonId = x.SitePersonId,
CardNo = x.CardNo,
PersonName = x.PersonName,
SexName = x.SexName,
Sex = x.Sex,
IdentityCard = x.IdentityCard,
Address = x.Address,
ProjectId = x.ProjectId,
ProjectCode = x.ProjectCode,
ProjectName = x.ProjectName,
UnitId = x.UnitId,
UnitCode = x.UnitCode,
UnitName = x.UnitName,
TeamGroupId = x.TeamGroupId,
TeamGroupName = x.TeamGroupName,
WorkPostId = x.WorkPostId,
WorkPostName = x.WorkPostName,
InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
@@ -406,10 +394,8 @@ namespace BLL
Telephone = x.Telephone,
PhotoUrl = x.PhotoUrl,
DepartName = x.DepartName,
WorkAreaId = x.WorkAreaId,
WorkAreaName = x.WorkAreaName,
PostType = x.PostType,
IsForeign = x.IsForeign.HasValue ? x.IsForeign : false,
PersonType = x.PersonType,
PersonTypeName = x.PersonType == "2" ? "外聘" : (x.PersonType == "3" ? "第三方" : "员工"),
PostTypeName = db.Sys_Const.FirstOrDefault(z => z.GroupId == ConstValue.Group_PostType && z.ConstValue == x.PostType).ConstText,
@@ -1113,6 +1099,55 @@ namespace BLL
}
#endregion
#region 根据条件获取人员出入场记录（支持多条件过滤）
/// <summary>
/// 根据条件获取人员出入场记录（支持多条件过滤）
/// </summary>
/// <param name="filter">查询过滤条件</param>
/// <returns></returns>
public static List<Model.PersonInOutItem> getPersonInOutListByFilter(Model.PersonInOutRecordInput filter)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var query = from x in db.SitePerson_PersonInOut
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
WorkPostId = y.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
IsInName = x.IsIn == true ? "进场" : "出场",
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
// 添加过滤条件
if (filter != null)
{
// 单位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.UnitName))
{
query = query.Where(x => x.UnitName.Contains(filter.UnitName));
}
// 人员姓名过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.PersonName))
{
query = query.Where(x => x.PersonName.Contains(filter.PersonName));
}
}
return query.OrderByDescending(x => x.ChangeTimeD).ToList();
}
}
#endregion
#region 根据identityCard获取人员资质信息
/// <summary>
/// 根据identityCard获取人员资质信息