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

根据条件获取人员出入场记录接口取消项目代号必填，返回增加项目代号，项目名称，人员身份证号信息。

This commit is contained in:
李鹏飞 2026-02-28 14:49:05 +08:00
parent 3a6308a7c9
commit bc2427b335
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SGGL/BLL/API/APIPersonService.cs
View File

@ -1117,14 +1117,17 @@ namespace BLL
var query = from x in db.SitePerson_PersonInOut var query = from x in db.SitePerson_PersonInOut
join y in db.SitePerson_Person on x.PersonId equals y.PersonId join y in db.SitePerson_Person on x.PersonId equals y.PersonId
join z in db.Base_Project on x.ProjectId equals z.ProjectId join z in db.Base_Project on x.ProjectId equals z.ProjectId
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectCode.Contains(filter.ProjectCode) where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime
select new Model.PersonInOutItem select new Model.PersonInOutItem
{ {
PersonId = x.PersonId, PersonId = x.PersonId,
PersonName = y.PersonName, PersonName = y.PersonName,
ProjectId = x.ProjectId, ProjectId = x.ProjectId,
ProjectCode=z.ProjectCode,
ProjectName=z.ProjectName,
UnitId = y.UnitId, UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName, UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
IdentityCard=x.IdentityCard,
WorkPostId = y.WorkPostId, WorkPostId = y.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName, WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn, IsIn = x.IsIn,
@ -1142,7 +1145,11 @@ namespace BLL
{ {
query = query.Where(x => x.UnitName.Contains(filter.UnitName)); query = query.Where(x => x.UnitName.Contains(filter.UnitName));
} }
// 项目代号过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.ProjectCode))
{
query = query.Where(x => x.ProjectCode.Contains(filter.ProjectCode));
}
// 人员姓名过滤（模糊查询） // 人员姓名过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.PersonName)) if (!string.IsNullOrEmpty(filter.PersonName))
{ {

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
View File

@ -67,7 +67,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(Approval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false); BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(Approval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false);
DropConstructionManager.Label = "现场执行经理"; DropConstructionManager.Label = "现场执行经理";
Approval_Construction.Label = "劳务管理组"; Approval_Construction.Label = "主办部门负责人";
DropProjectManager.Label = "项目经理"; DropProjectManager.Label = "项目经理";
} }
#endregion #endregion

14
SGGL/Model/APIItem/HSSE/PersonInOutItem.cs
View File

@ -86,6 +86,20 @@ namespace Model
get; set; get; set;
} }
/// <summary> /// <summary>
/// 项目代号
/// </summary>
public string ProjectCode
{
get; set;
}
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName
{
get; set;
}
/// <summary>
/// 单位ID /// 单位ID
/// </summary> /// </summary>
public string UnitId public string UnitId

13
SGGL/WebAPI/Controllers/PersonController.cs
View File

@ -1075,12 +1075,13 @@ namespace WebAPI.Controllers
responeData.message = "StartTime不能大于EndTime！"; responeData.message = "StartTime不能大于EndTime！";
return responeData; return responeData;
} }
if (filter == null || string.IsNullOrEmpty(filter.ProjectCode)) //20260228 赛鼎it要求取消projectcode必填验证，改为如果有projectcode则按照projectcode查询，没有则不过滤projectcode查询
{ //if (filter == null || string.IsNullOrEmpty(filter.ProjectCode))
responeData.code = 0; //{
responeData.message = "ProjectCode为必填参数！"; // responeData.code = 0;
return responeData; // responeData.message = "ProjectCode为必填参数！";
} // return responeData;
//}
// 处理可空参数的默认值 // 处理可空参数的默认值
int actualPagesize = pagesize ?? 15; int actualPagesize = pagesize ?? 15;