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 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+8 -3
View File
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
};
if (personLists.Count() > 0)
{
var personIn = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
var personIn = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == 1
&& x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList();
rootNode.ToolTip = "当前项目人员总数：" + personLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + (personLists.Count() - personIn.Count());
}
@@ -143,7 +143,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (personUnitLists.Count() > 0)
{
var personIn = personUnitLists.Where(x => x.InTime <= System.DateTime.Now && x.IsUsed == true
var personIn = personUnitLists.Where(x => x.InTime <= System.DateTime.Now && x.IsUsed == 1
&& (!x.OutTime.HasValue || x.OutTime >= System.DateTime.Now));
newNode.ToolTip = q.UnitName + "人员总数：" + personUnitLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + (personUnitLists.Count() - personIn.Count());
}
@@ -195,7 +195,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
strSql += " AND UnitId IS NULL";
}
if (drpIsUsedName.SelectedValue == "是")
if (drpIsUsedName.SelectedValue == "待审核")
{
strSql += " AND IsUsed = @IsUsed";
listStr.Add(new SqlParameter("@IsUsed", "2"));
}
else if (drpIsUsedName.SelectedValue == "在岗")
{
strSql += " AND IsUsed = @IsUsed";
listStr.Add(new SqlParameter("@IsUsed", "1"));