危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -216,9 +216,9 @@ namespace FineUIPro.Web.HSSE.Meeting
|
||||
DateTime end = DateTime.Parse(string.Format("{0} 23:59:59", this.txtEndTime.Text.Trim()));
|
||||
try
|
||||
{
|
||||
str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.ClassMeetingDate >= start && x.ClassMeetingDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString();
|
||||
str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == (string)groupId && x.ClassMeetingDate >= start && x.ClassMeetingDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString();
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
str = "";
|
||||
}
|
||||
|
||||
@@ -59,7 +59,10 @@ namespace FineUIPro.Web.HSSE.Meeting
|
||||
this.drpUnit.Text = UnitService.GetUnitNameByUnitId(classMeeting.UnitId);
|
||||
this.drpTeamGroup.Text = TeamGroupService.GetTeamGroupNameByTeamGroupId(classMeeting.TeamGroupId);
|
||||
this.txtAttentPersonNum.Text = classMeeting.AttentPersonNum.ToString();
|
||||
this.textInstallationName.Text = classMeeting.InstallationName.ToString();
|
||||
if (!string.IsNullOrEmpty(classMeeting.InstallationName))
|
||||
{
|
||||
this.textInstallationName.Text = classMeeting.InstallationName;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user