@@ -212,7 +210,7 @@
var cRectificationRate = '<%=CRectificationRate %>'
var cQualifiedRate = '<%=CQualifiedRate %>'
function getValues() {
- $('#circleId').attr('data-value', onDutyRate);
+ //$('#circleId').attr('data-value', onDutyRate);
$('#circleId1').attr('data-value', cRectificationRate);
$('#circleId2').attr('data-value', cQualifiedRate);
}
@@ -984,7 +982,7 @@
$(function () {
initCircle()
- initBarEchart()
+ // initBarEchart()
initMapEchart()
if (content_Height > Box_Height) {
initScroll()
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
index 95997aee..5c7f9a08 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
@@ -65,30 +65,32 @@ namespace FineUIPro.Web
/// 当前现场总人数
///
private void getSitePerson()
- {
- // var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now);
- string sql = @"select c.ConstText,b.PostType,count( *) num from SitePerson_Person a left join Base_WorkPost b on a.WorkPostId=b.WorkPostId
- LEFT JOIN Sys_Const AS c ON c.ConstValue = b.PostType and c.GroupId = 'PostType' where IsUsed =1 and InTime<='" + DateTime.Now.ToString("yyyy-MM-dd") + "' and (OutTime is null or OutTime>'" + DateTime.Now.ToString("yyyy-MM-dd") + @"' )
- and a.ProjectId='" + this.CurrUser.LoginProjectId + @"' and a.AuditorDate is not null
- group by c.ConstText,b.PostType ";
- List
listStr = new List();
- SqlParameter[] parameter = listStr.ToArray();
- DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
- int allcount = 0;
- int mcount = 0;
- if (tb != null)
- {
- foreach (DataRow row in tb.Rows)
- {
- allcount += int.Parse(row["num"].ToString());
- if (!string.IsNullOrEmpty(row["ConstText"].ToString()) && row["ConstText"].ToString().Contains("管理"))
- {
- mcount += int.Parse(row["num"].ToString());
- }
- }
- }
+ {
+ var getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList();
- this.divPersonNum.InnerHtml = allcount.ToString();
+ // var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now);
+ //string sql = @"select c.ConstText,b.PostType,count( *) num from SitePerson_Person a left join Base_WorkPost b on a.WorkPostId=b.WorkPostId
+ // LEFT JOIN Sys_Const AS c ON c.ConstValue = b.PostType and c.GroupId = 'PostType' where IsUsed =1 and InTime<='" + DateTime.Now.ToString("yyyy-MM-dd") + "' and (OutTime is null or OutTime>'" + DateTime.Now.ToString("yyyy-MM-dd") + @"' )
+ // and a.ProjectId='" + this.CurrUser.LoginProjectId + @"' and a.AuditorDate is not null
+ // group by c.ConstText,b.PostType ";
+ // List listStr = new List();
+ // SqlParameter[] parameter = listStr.ToArray();
+ // DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
+ // int allcount = 0;
+ // int mcount = 0;
+ // if (tb != null)
+ // {
+ // foreach (DataRow row in tb.Rows)
+ // {
+ // allcount += int.Parse(row["num"].ToString());
+ // if (!string.IsNullOrEmpty(row["ConstText"].ToString()) && row["ConstText"].ToString().Contains("管理"))
+ // {
+ // mcount += int.Parse(row["num"].ToString());
+ // }
+ // }
+ // }
+
+ this.divPersonNum.InnerHtml = getEmployInOutRecords.Count().ToString();
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
{
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
index 6756b3e0..27102321 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
@@ -93,8 +93,9 @@ namespace FineUIPro.Web.common
}
}
}
- }
- if (sumMonthCount>0)
+ }
+
+ if (sumMonthCount>0)
{
this.divSafeWorkTime.InnerHtml = sumMonthCount.ToString("0000000000"); ;
}
@@ -142,22 +143,24 @@ namespace FineUIPro.Web.common
/// 劳务统计
///
private void getSitePerson()
- {
+ {
+ var getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList();
- string sql = @"select c.ConstText,b.PostType,count( *) num from SitePerson_Person a left join Base_WorkPost b on a.WorkPostId=b.WorkPostId
+
+ string sql = @"select c.ConstText,b.PostType,count( *) num from SitePerson_Person a left join Base_WorkPost b on a.WorkPostId=b.WorkPostId
LEFT JOIN Sys_Const AS c ON c.ConstValue = b.PostType and c.GroupId = 'PostType' where IsUsed =1 and InTime<='" + DateTime.Now.ToString("yyyy-MM-dd") + "' and (OutTime is null or OutTime>'" + DateTime.Now.ToString("yyyy-MM-dd") + @"' )
and a.ProjectId='" + this.ProjectId + @"' and a.AuditorDate is not null
group by c.ConstText,b.PostType ";
List listStr = new List();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
- int allcount = 0;
+ int allcount = getEmployInOutRecords.Count();
int mcount = 0;
if (tb != null)
{
foreach (DataRow row in tb.Rows)
{
- allcount += int.Parse(row["num"].ToString());
+ //allcount += int.Parse(row["num"].ToString());
if (!string.IsNullOrEmpty(row["ConstText"].ToString()) && row["ConstText"].ToString().Contains("管理"))
{
mcount += int.Parse(row["num"].ToString());
@@ -165,9 +168,18 @@ namespace FineUIPro.Web.common
}
}
this.divALLPerson.InnerHtml = allcount.ToString();
- this.divGLPerson.InnerHtml = mcount.ToString();
- this.divZYPerson.InnerHtml = (allcount - mcount).ToString();
+
+ if (allcount > mcount)
+ {
+ this.divGLPerson.InnerHtml = mcount.ToString();
+ this.divZYPerson.InnerHtml = (allcount - mcount).ToString();
+ }
+ else
+ {
+ this.divGLPerson.InnerHtml = allcount.ToString();
+ this.divZYPerson.InnerHtml = "0";
+ }
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
{
diff --git a/SGGL/Model/APIItem/HSSE/TrainingPlanItemItem.cs b/SGGL/Model/APIItem/HSSE/TrainingPlanItemItem.cs
index 3a786f12..8cd2f130 100644
--- a/SGGL/Model/APIItem/HSSE/TrainingPlanItemItem.cs
+++ b/SGGL/Model/APIItem/HSSE/TrainingPlanItemItem.cs
@@ -71,6 +71,11 @@ namespace Model
{
get;
set;
- }
- }
+ }
+ public int ? LearningTime
+ {
+ get;
+ set;
+ }
+ }
}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index c9ac9963..fc3c0a58 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -81903,6 +81903,8 @@ namespace Model
private string _ProjectId;
+ private string _FileCode;
+
private EntityRef _Sys_User;
#region 可扩展性方法定义
@@ -81925,6 +81927,8 @@ namespace Model
partial void OnRemarkChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
+ partial void OnFileCodeChanging(string value);
+ partial void OnFileCodeChanged();
#endregion
public Common_FileManager()
@@ -82097,6 +82101,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50)")]
+ public string FileCode
+ {
+ get
+ {
+ return this._FileCode;
+ }
+ set
+ {
+ if ((this._FileCode != value))
+ {
+ this.OnFileCodeChanging(value);
+ this.SendPropertyChanging();
+ this._FileCode = value;
+ this.SendPropertyChanged("FileCode");
+ this.OnFileCodeChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Common_FileManager_Sys_User", Storage="_Sys_User", ThisKey="UploadMan", OtherKey="UserId", IsForeignKey=true)]
public Sys_User Sys_User
{
@@ -363195,6 +363219,8 @@ namespace Model
private string _WorkPostIds;
+ private System.Nullable _LearningTime;
+
private EntitySet _Person_TrainingTask;
private EntityRef _Training_CompanyTraining;
@@ -363219,6 +363245,8 @@ namespace Model
partial void OnCompileDateChanged();
partial void OnWorkPostIdsChanging(string value);
partial void OnWorkPostIdsChanged();
+ partial void OnLearningTimeChanging(System.Nullable value);
+ partial void OnLearningTimeChanged();
#endregion
public Training_CompanyTrainingItem()
@@ -363392,6 +363420,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LearningTime", DbType="Int")]
+ public System.Nullable LearningTime
+ {
+ get
+ {
+ return this._LearningTime;
+ }
+ set
+ {
+ if ((this._LearningTime != value))
+ {
+ this.OnLearningTimeChanging(value);
+ this.SendPropertyChanging();
+ this._LearningTime = value;
+ this.SendPropertyChanged("LearningTime");
+ this.OnLearningTimeChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Person_TrainingTask_Training_CompanyTrainingItem", Storage="_Person_TrainingTask", ThisKey="CompanyTrainingItemId", OtherKey="CompanyTrainingItemId", DeleteRule="NO ACTION")]
public EntitySet Person_TrainingTask
{
@@ -369225,6 +369273,8 @@ namespace Model
private string _UpState;
+ private System.Nullable _LearningTime;
+
private EntitySet _Training_PlanItem;
private EntityRef _Sys_User;
@@ -369267,6 +369317,8 @@ namespace Model
partial void OnUnitIdChanged();
partial void OnUpStateChanging(string value);
partial void OnUpStateChanged();
+ partial void OnLearningTimeChanging(System.Nullable value);
+ partial void OnLearningTimeChanged();
#endregion
public Training_TrainingItem()
@@ -369605,6 +369657,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LearningTime", DbType="Int")]
+ public System.Nullable LearningTime
+ {
+ get
+ {
+ return this._LearningTime;
+ }
+ set
+ {
+ if ((this._LearningTime != value))
+ {
+ this.OnLearningTimeChanging(value);
+ this.SendPropertyChanging();
+ this._LearningTime = value;
+ this.SendPropertyChanged("LearningTime");
+ this.OnLearningTimeChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_PlanItem_Training_TrainingItem", Storage="_Training_PlanItem", ThisKey="TrainingItemId", OtherKey="TrainingEduItemId", DeleteRule="NO ACTION")]
public EntitySet Training_PlanItem
{