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

人员查询接口改用项目代号作为必填参数 

- 在 ProjectPersonInput/Output 和 PersonInOutRecordInput 模型中添加 ProjectCode 属性
  - GetProjectPerson 和 GetPersonInOutRecord 接口必填参数改为 ProjectCode
  - APIPersonService 添加项目代号过滤逻辑和查询结果输出
This commit is contained in:
李鹏飞 2026-01-28 15:18:10 +08:00
parent f1224ea194
commit 403ae1921b
6 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,11 @@ namespace BLL
{
query = query.Where(x => x.ProjectName.Contains(filter.ProjectName));
}
// 项目代号过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.ProjectCode))
{
query = query.Where(x => x.ProjectCode.Contains(filter.ProjectCode));
}
// 人员ID过滤
if (!string.IsNullOrEmpty(filter.PersonId))
{
@ -384,6 +388,7 @@ namespace BLL
IdentityCard = x.IdentityCard,
ProjectId = x.ProjectId,
ProjectName = x.ProjectName,
ProjectCode= x.ProjectCode,
UnitId = x.UnitId,
UnitName = x.UnitName,
TeamGroupName = x.TeamGroupName,
@ -1112,7 +1117,7 @@ namespace BLL
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)
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectCode.Contains(filter.ProjectCode)
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
@ -1130,7 +1135,12 @@ namespace BLL
// 添加过滤条件
if (filter != null)
{
{
// 项目名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.ProjectName))
{
query = query.Where(x => x.ProjectName.Contains(filter.ProjectName));
}
// 单位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.UnitName))
{

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -16910,7 +16910,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

4
SGGL/Model/HSSE/PersonInOutRecordInput.cs
View File

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

4
SGGL/Model/HSSE/ProjectPersonInput.cs
View File

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

4
SGGL/Model/HSSE/ProjectPersonOutput.cs
View File

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

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

@ -102,7 +102,7 @@ namespace WebAPI.Controllers
/// <summary>
/// 根据条件获取项目人员信息（支持分页和过滤）
/// </summary>
/// <param name="filter">查询过滤条件（ProjectName为必填参数）</param>
/// <param name="filter">查询过滤条件（ProjectCode为必填参数）</param>
/// <param name="pagesize">每页条数</param>
/// <param name="pageindex">页码（从1开始）</param>
/// <param name="returnAll">是否返回全部数据</param>
@ -112,11 +112,11 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
// 验证必填参数 ProjectName
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
// 验证必填参数 ProjectCode
if (filter == null || string.IsNullOrEmpty(filter.ProjectCode))
{
responeData.code = 0;
responeData.message = "ProjectName为必填参数！";
responeData.message = "ProjectCode为必填参数！";
return responeData;
}
@ -1072,10 +1072,10 @@ namespace WebAPI.Controllers
responeData.message = "StartTime不能大于EndTime！";
return responeData;
}
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
if (filter == null || string.IsNullOrEmpty(filter.ProjectCode))
{
responeData.code = 0;
responeData.message = "ProjectName为必填参数！";
responeData.message = "ProjectCode为必填参数！";
return responeData;
}