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

1

Browse Source
This commit is contained in:
高飞
2026-03-06 17:59:43 +08:00
parent adedb7e83d 4b8bc359cf
commit 52cbae5b71
54 changed files with 2404 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/PersonController.cs
+19 -15
View File
@@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Configuration;
using System.IO;
@@ -102,7 +103,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 +113,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;
}
@@ -808,15 +809,17 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList();
var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ;
// var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList();
// var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ;
responeData.data = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
where x.ProjectId == projectId && !x.ExchangeTime.HasValue
join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
join traindetail in Funs.DB.EduTrain_TrainRecordDetail on x.PersonId equals traindetail.PersonId
join train in Funs.DB.EduTrain_TrainRecord on traindetail.TrainingId equals train.TrainingId
where x.ProjectId == projectId && !x.ExchangeTime.HasValue && train.ProjectId == projectId
&& x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null
where personIds.Contains(x.PersonId)
// where personIds.Contains(x.PersonId)
select new
{
x.PersonId,
@@ -1072,12 +1075,13 @@ namespace WebAPI.Controllers
responeData.message = "StartTime不能大于EndTime！";
return responeData;
}
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
{
responeData.code = 0;
responeData.message = "ProjectName为必填参数！";
return responeData;
}
//20260228 赛鼎it要求取消projectcode必填验证，改为如果有projectcode则按照projectcode查询，没有则不过滤projectcode查询
//if (filter == null || string.IsNullOrEmpty(filter.ProjectCode))
//{
// responeData.code = 0;
// responeData.message = "ProjectCode为必填参数！";
// return responeData;
//}
// 处理可空参数的默认值
int actualPagesize = pagesize ?? 15;