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

提交首页修改

Browse Source
This commit is contained in:
高飞
2022-12-20 17:45:42 +08:00
parent 12a490ab94
commit bb65f0d461
196 changed files with 81389 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
+3 -3
View File
@@ -174,7 +174,7 @@ namespace WebAPI.Controllers
OutResult = person.OutResult,
Birthday = person.Birthday,
Telephone = person.Telephone,
IsUsed = (person.IsUsed == false ? false : true),
IsUsed = (person.IsUsed == false ? 0 : 1),
InTime = Funs.GetNewDateTimeOrNow(person.InTime),
Password = BLL.PersonService.GetPersonPassWord(person.IdentityCard),
Isprint = "0",
@@ -263,7 +263,7 @@ namespace WebAPI.Controllers
getPerson.OutResult = newPerson.OutResult;
getPerson.Birthday = newPerson.Birthday;
getPerson.Telephone = newPerson.Telephone;
getPerson.IsUsed = true;
getPerson.IsUsed = 1;
getPerson.InTime = newPerson.InTime;
if (!string.IsNullOrEmpty(newPerson.TeamGroupId))
{
@@ -332,7 +332,7 @@ namespace WebAPI.Controllers
where x.ProjectId == getProject.ProjectId && !x.ExchangeTime.HasValue
&& (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
&& x.InTime.HasValue && x.InTime < DateTime.Now
&& x.IsUsed == true
&& x.IsUsed == 1
&& x.PhotoUrl != null
select new
{
SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs
+3 -3
View File
@@ -59,7 +59,7 @@ namespace WebAPI.Controllers
{
var getPersons = from x in db.SitePerson_Person
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.ProjectId == projectId && y.PostType == Const.PostType_2 && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
where x.ProjectId == projectId && y.PostType == Const.PostType_2 && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
select x;
if (isSub)
{
@@ -93,7 +93,7 @@ namespace WebAPI.Controllers
{
var getPersons = from x in db.SitePerson_Person
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.ProjectId == projectId && y.IsHsse ==true && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
where x.ProjectId == projectId && y.IsHsse ==true && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
select x;
if (isSub)
{
@@ -127,7 +127,7 @@ namespace WebAPI.Controllers
{
var getPersons = from x in db.SitePerson_Person
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.ProjectId == projectId && y.PostType == Const.PostType_5 && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime >DateTime.Now)
where x.ProjectId == projectId && y.PostType == Const.PostType_5 && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime >DateTime.Now)
select x;
if (isSub)
{
SGGL/WebAPI/Controllers/PersonController.cs
+4 -4
View File
@@ -147,13 +147,13 @@ namespace WebAPI.Controllers
}
int tatalCount = getViews.Count();
//在审
int count0 = getViews.Where(x => x.IsUsed == false && !x.AuditorDate.HasValue).Count();
int count0 = getViews.Where(x => x.IsUsed == 1 && !x.AuditorDate.HasValue).Count();
//在岗
int count1 = getViews.Where(x => x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now)).Count();
int count1 = getViews.Where(x => x.IsUsed == 1 && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now)).Count();
//离岗
int count2 = getViews.Where(x => x.IsUsed == true && x.OutTime <= DateTime.Now).Count();
int count2 = getViews.Where(x => x.IsUsed == 1 && x.OutTime <= DateTime.Now).Count();
//打回
int count3 = getViews.Where(x => x.IsUsed == false && x.AuditorDate.HasValue).Count();
int count3 = getViews.Where(x => x.IsUsed == 1 && x.AuditorDate.HasValue).Count();
responeData.data = new { tatalCount, count0, count1, count2, count3 };
}
}