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

1

This commit is contained in:
高飞 2026-04-07 16:58:38 +08:00
parent 21bd80e1ea
commit cd79f9921b
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17019,7 +17019,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

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

@ -113,7 +113,7 @@ namespace WebAPI.Controllers
/// <param name="pageindex">页码（从1开始）</param> /// <param name="pageindex">页码（从1开始）</param>
/// <param name="returnAll">是否返回全部数据</param> /// <param name="returnAll">是否返回全部数据</param>
/// <returns></returns> /// <returns></returns>
public Model.ResponeData getPersonByFilter([FromUri] Model.ProjectPersonInput filter, int? pagesize = 15, int? pageindex = 1, bool ? returnAll = false) public Model.ResponeData getPersonByFilter([FromUri] Model.ProjectPersonInput filter, int? pagesize = 15, int? pageindex = 1, bool? returnAll = false)
{ {
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try try
@ -383,12 +383,12 @@ namespace WebAPI.Controllers
/// <param name="trainTypeId">培训类型ID(可为空)</param> /// <param name="trainTypeId">培训类型ID(可为空)</param>
/// <param name="pageIndex">分页</param> /// <param name="pageIndex">分页</param>
/// <returns></returns> /// <returns></returns>
public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex) public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex, string startDate, string endDate)
{ {
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try try
{ {
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId,null).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList(); var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId, null, startDate, endDate).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count; int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0) if (pageCount > 0 && pageIndex > 0)
{ {
@ -414,12 +414,12 @@ namespace WebAPI.Controllers
/// <param name="name"></param> /// <param name="name"></param>
/// <param name="pageIndex"></param> /// <param name="pageIndex"></param>
/// <returns></returns> /// <returns></returns>
public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId,string name, int pageIndex) public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, string name, int pageIndex)
{ {
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try try
{ {
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId,name).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList(); var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId, name).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count; int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0) if (pageCount > 0 && pageIndex > 0)
{ {
@ -709,7 +709,7 @@ namespace WebAPI.Controllers
IdentityCard = idCard, IdentityCard = idCard,
IsIn = isIn == 1 ? true : false, IsIn = isIn == 1 ? true : false,
ChangeTime = changeTime, ChangeTime = changeTime,
InOutWay = Const.InOutWay_1 InOutWay = Const.InOutWay_1
}; };
PersonInOutService.AddPersonInOut(newInOut); PersonInOutService.AddPersonInOut(newInOut);
@ -818,7 +818,7 @@ namespace WebAPI.Controllers
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId 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 join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
where x.ProjectId == projectId && !x.ExchangeTime.HasValue where x.ProjectId == projectId && !x.ExchangeTime.HasValue
&& x.States == Const.ProjectPersonStates_1 && x.CardNo.Length> 5 && persons.PhotoUrl != null && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null
select new select new
{ {
x.PersonId, x.PersonId,
@ -837,7 +837,7 @@ namespace WebAPI.Controllers
TrainRecord = APIPersonService.getStrTrainRecordByPersonId(x.PersonId), TrainRecord = APIPersonService.getStrTrainRecordByPersonId(x.PersonId),
x.ExchangeTime, x.ExchangeTime,
x.ExchangeTime2, x.ExchangeTime2,
PhotoUrl=persons.PhotoUrl.Replace('\\', '/'), PhotoUrl = persons.PhotoUrl.Replace('\\', '/'),
}).Take(200).ToList(); }).Take(200).ToList();
} }
catch (Exception ex) catch (Exception ex)
@ -852,15 +852,15 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try try
{ {
// var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).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(); ; // 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 responeData.data = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId 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 join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
join traindetail in Funs.DB.Training_TestRecord on x.PersonId equals traindetail.TestManId join traindetail in Funs.DB.Training_TestRecord on x.PersonId equals traindetail.TestManId
where x.ProjectId == projectId && !x.ExchangeTime.HasValue && traindetail.ProjectId == projectId where x.ProjectId == projectId && !x.ExchangeTime.HasValue && traindetail.ProjectId == projectId
&& x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null && traindetail.TestScores >= 60 && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null && traindetail.TestScores >= 60
// where personIds.Contains(x.PersonId) // where personIds.Contains(x.PersonId)
select new select new
{ {
@ -881,13 +881,13 @@ namespace WebAPI.Controllers
persons.Address, persons.Address,
TrainRecord = APIPersonService.getStrTrainingTestRecordByPersonId(x.PersonId), TrainRecord = APIPersonService.getStrTrainingTestRecordByPersonId(x.PersonId),
x.ExchangeTime, x.ExchangeTime,
x.ExchangeTime2, x.ExchangeTime2,
x.AuditorDate, x.AuditorDate,
PhotoUrl = persons.PhotoUrl.Replace('\\', '/'), PhotoUrl = persons.PhotoUrl.Replace('\\', '/'),
IsUsed = x.States == Const.ProjectPersonStates_1 ? 1 : 0, IsUsed = x.States == Const.ProjectPersonStates_1 ? 1 : 0,
BlackList = 0 BlackList = 0
}).Take(200).ToList(); }).Take(200).ToList();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -965,7 +965,7 @@ namespace WebAPI.Controllers
/// <param name="idCard"></param> /// <param name="idCard"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <returns></returns> /// <returns></returns>
public Model.ResponeData getUpdatePersonExchangeTime(string projectId,string idCard, string type) public Model.ResponeData getUpdatePersonExchangeTime(string projectId, string idCard, string type)
{ {
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try try
@ -978,9 +978,9 @@ namespace WebAPI.Controllers
else else
{ {
responeData.code = 1; responeData.code = 1;
responeData.message = "当前项目不存在身份证为：" + idCard.ToString() +"的人员！"; responeData.message = "当前项目不存在身份证为：" + idCard.ToString() + "的人员！";
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -1024,7 +1024,7 @@ namespace WebAPI.Controllers
#endregion #endregion
#region 获取人员信息出入场记录-查询 #region 获取人员信息出入场记录-查询
@ -1113,7 +1113,7 @@ namespace WebAPI.Controllers
responeData.code = 0; responeData.code = 0;
responeData.message = "StartTime和EndTime为必填参数！"; responeData.message = "StartTime和EndTime为必填参数！";
return responeData; return responeData;
} }
// 验证时间范围 // 验证时间范围
if (filter.StartTime > filter.EndTime) if (filter.StartTime > filter.EndTime)
{ {