2安全生产看板补充在岗人数
This commit is contained in:
parent
9047627ae1
commit
e84ccc038a
|
@ -1356,4 +1356,8 @@
|
|||
<value>Completion status of engineering quantity</value>
|
||||
<comment>工程量完成情况</comment>
|
||||
</data>
|
||||
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
|
||||
<value>OnDuty</value>
|
||||
<comment>在岗人数</comment>
|
||||
</data>
|
||||
</root>
|
|
@ -1200,4 +1200,7 @@
|
|||
<data name="mainProject2_QuantityDone" xml:space="preserve">
|
||||
<value>工程量完成情况</value>
|
||||
</data>
|
||||
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
|
||||
<value>在岗人数</value>
|
||||
</data>
|
||||
</root>
|
|
@ -1197,4 +1197,7 @@
|
|||
<data name="mainProject2_QuantityDone" xml:space="preserve">
|
||||
<value>工程量完成情况</value>
|
||||
</data>
|
||||
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
|
||||
<value>在岗人数</value>
|
||||
</data>
|
||||
</root>
|
File diff suppressed because it is too large
Load Diff
|
@ -90,7 +90,7 @@
|
|||
</div>
|
||||
<div class="y_rs_box y_column">
|
||||
<div class="y_rs_number" id="div_xmcjrs" runat="server">0</div>
|
||||
<div class="y_rs_text"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_ProjectNum_Participants%>"/></div>
|
||||
<div class="y_rs_text"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_ProjectNum_OnDuty%>"/></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -78,13 +78,15 @@ namespace FineUIPro.Web.common
|
|||
where y.IsHsse == true && x.IsUsed == true
|
||||
select x).Count().ToString();
|
||||
div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
|
||||
//项目参建
|
||||
//企业总部参建人数
|
||||
div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person
|
||||
where x.IsUsed == true
|
||||
select x).Count().ToString();
|
||||
//项目在岗人数
|
||||
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
|
||||
where x.IsUsed == true
|
||||
where x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
|
||||
select x).Count().ToString();
|
||||
|
||||
//企业总部参建人数
|
||||
div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
|
||||
//注安师
|
||||
var ZasSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
|
||||
Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone
|
||||
|
@ -115,10 +117,15 @@ namespace FineUIPro.Web.common
|
|||
where y.IsHsse == true && x.IsUsed == true
|
||||
&& pids.Contains(x.ProjectId)
|
||||
select x).Count().ToString();
|
||||
//项目参建
|
||||
//项目参建人数
|
||||
div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person
|
||||
where x.IsUsed == true
|
||||
&& pids.Contains(x.ProjectId)
|
||||
select x).Count().ToString();
|
||||
|
||||
//项目在岗人数
|
||||
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
|
||||
where x.IsUsed == true
|
||||
&& pids.Contains(x.ProjectId)
|
||||
where x.IsUsed == true && pids.Contains(x.ProjectId) && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
|
||||
select x).Count().ToString();
|
||||
|
||||
string s1 = string.Format("'{0}'", String.Join(",", pids).Replace(",", "','"));
|
||||
|
@ -142,7 +149,6 @@ namespace FineUIPro.Web.common
|
|||
|
||||
div_qyzbrs1.InnerHtml = div_xmrs.InnerHtml;
|
||||
div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
|
||||
div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue