zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员考试

Browse Source
This commit is contained in:
李超
2023-02-23 18:49:20 +08:00
parent d3116638f6
commit 8eca8fb237
14 changed files with 1537 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/PersonController.cs
+23 -3
View File
@@ -583,12 +583,30 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
responeData.data = from x in Funs.DB.SitePerson_Person_Bak
DateTime dateTime = DateTime.Now;
if (dateTime != null)
{
if (DateTime.Now.Hour < 12)
{
dateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
dateTime= dateTime.AddHours(10);
}
else
{
dateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
dateTime = dateTime.AddHours(15);
}
}
responeData.data = from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId
&& !x.ExchangeTime.HasValue
&& (!x.OutTime.HasValue || x.OutTime > DateTime.Now) && x.InTime.HasValue && x.InTime < DateTime.Now
&& x.IsUsed == true
&& x.InTime.HasValue && x.InTime < DateTime.Now
&& x.IsUsed == 1
&& x.PhotoUrl != null
select new
{
@@ -600,6 +618,7 @@ namespace WebAPI.Controllers
y.UnitCode,
y.UnitName,
y.ShortUnitName,
askForLeave = Funs.DB.SitePerson_AskForLeave.FirstOrDefault(z=>z.PersonId==x.PersonId && x.ProjectId==z.ProjectId&&z.DateA<= dateTime && z.DateZ>= dateTime) ==null?true:false,
Funs.DB.ProjectData_TeamGroup.First(z => z.TeamGroupId == x.TeamGroupId).TeamGroupName,
x.Sex,
Funs.DB.Base_WorkPost.First(z => z.WorkPostId == x.WorkPostId).WorkPostName,
@@ -610,6 +629,7 @@ namespace WebAPI.Controllers
x.ExchangeTime,
x.ExchangeTime2,
x.PhotoUrl,
x.OutTime
};
}
catch (Exception ex)