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

1

Browse Source
This commit is contained in:
高飞
2025-12-26 10:53:38 +08:00
parent 70f08c69ab 8fe384bb6a
commit 2b54ca1530
13 changed files with 584 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIPersonService.cs
+163
View File
@@ -293,6 +293,119 @@ namespace BLL
}
#endregion
#region 根据条件获取项目人员信息（支持多条件过滤）
/// <summary>
/// 根据条件获取项目人员信息（支持多条件过滤）
/// </summary>
/// <param name="filter">查询过滤条件</param>
/// <returns></returns>
public static List<Model.ProjectPersonOutput> getPersonByFilter(Model.ProjectPersonInput filter)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var query = from x in db.View_SitePerson_Person
select x;
// 添加过滤条件
if (filter != null)
{
// 项目ID过滤
if (!string.IsNullOrEmpty(filter.ProjectId))
{
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))
{
query = query.Where(x => x.PersonId == filter.PersonId);
}
// 项目人员ID过滤
if (!string.IsNullOrEmpty(filter.SitePersonId))
{
query = query.Where(x => x.SitePersonId == filter.SitePersonId);
}
// 姓名过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.PersonName))
{
query = query.Where(x => x.PersonName.Contains(filter.PersonName));
}
// 身份证号过滤
if (!string.IsNullOrEmpty(filter.IdentityCard))
{
query = query.Where(x => x.IdentityCard == filter.IdentityCard);
}
// 卡号过滤
if (!string.IsNullOrEmpty(filter.CardNo))
{
query = query.Where(x => x.CardNo == filter.CardNo);
}
// 单位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.UnitName))
{
query = query.Where(x => x.UnitName.Contains(filter.UnitName));
}
// 班组名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.TeamGroupName))
{
query = query.Where(x => x.TeamGroupName.Contains(filter.TeamGroupName));
}
// 岗位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.WorkPostName))
{
query = query.Where(x => x.WorkPostName.Contains(filter.WorkPostName));
}
}
// 默认只返回在岗人员
query = query.Where(x => x.States == Const.ProjectPersonStates_1);
var persons = from x in query orderby x.CardNo descending
select new Model.ProjectPersonOutput
{
PersonId = x.PersonId,
SitePersonId = x.SitePersonId,
CardNo = x.CardNo,
PersonName = x.PersonName,
SexName = x.SexName,
IdentityCard = x.IdentityCard,
ProjectId = x.ProjectId,
ProjectName = x.ProjectName,
UnitId = x.UnitId,
UnitName = x.UnitName,
TeamGroupName = x.TeamGroupName,
WorkPostName = x.WorkPostName,
InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
OutResult = x.OutResult,
Telephone = x.Telephone,
PhotoUrl = x.PhotoUrl,
DepartName = x.DepartName,
WorkAreaName = x.WorkAreaName,
PostType = x.PostType,
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,
};
return persons.ToList();
}
}
#endregion
#region 获取在岗、离岗、待审人员列表
/// <summary>
/// 记录数
@@ -986,6 +1099,56 @@ 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
join z in db.Base_Project on x.ProjectId equals z.ProjectId
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectName.Contains(filter.ProjectName)
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获取人员资质信息
SGGL/BLL/DropListService.cs
+9 -6
View File
@@ -463,12 +463,15 @@ namespace BLL
/// <returns></returns>
public static ListItem[] GetBidType()
{
ListItem[] list = new ListItem[5];
list[0] = new ListItem("招标", "公开招标");
list[1] = new ListItem("谈判", "邀请招标");
list[2] = new ListItem("询比 ", "询比价");
list[3] = new ListItem("竞价", "竞争性谈判");
list[4] = new ListItem("直接分包", "单一来源");
ListItem[] list = new ListItem[8];
list[0] = new ListItem("公开招标", "公开招标");
list[1] = new ListItem("邀请招标", "邀请招标");
list[2] = new ListItem("公开询比 ", "公开询比");
list[3] = new ListItem("邀请询比 ", "邀请询比");
list[4] = new ListItem("公开谈判", "公开谈判");
list[5] = new ListItem("邀请谈判", "邀请谈判");
list[6] = new ListItem("竞价", "竞价");
list[7] = new ListItem("直接分包", "直接分包");
return list;
}
SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
+2 -2
View File
@@ -127,8 +127,8 @@ namespace BLL
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitGetBidTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "Text";
dropName.DataTextField = "Value";
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = BLL.DropListService.GetBidType();
dropName.DataBind();
if (isShowPlease)