lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改五环安全月报

This commit is contained in:
潘鸿锋 2024-08-26 14:24:39 +08:00
parent 90b11e22d6
commit ba55ac64e4
8 changed files with 628 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql
View File

@ -3,7 +3,7 @@ alter table Manager_MonthReportC
add MonthHdangerCount int null;
alter table Manager_MonthReportC
add MonthHdangerCount int null;
add YearHdangerCount int null;
--增加Manager_HiddenDanger表本月隐患整改情况
CREATE TABLE [dbo].[Manager_HiddenDanger](
@ -18,4 +18,5 @@ CREATE TABLE [dbo].[Manager_HiddenDanger](
(
[Id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY];
) ON [PRIMARY];

4
SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs
View File

@ -233,6 +233,8 @@ namespace BLL
TotalHseManhoursYear = monthReport.TotalHseManhoursYear,
EmergencyManagementWorkDef=monthReport.EmergencyManagementWorkDef,
MonthHdangerCount=monthReport.MonthHdangerCount,
YearHdangerCount=monthReport.YearHdangerCount
};
db.Manager_MonthReportC.InsertOnSubmit(newMonthReport);
@ -309,6 +311,8 @@ namespace BLL
newMonthReport.TotalHseManhoursYear = monthReport.TotalHseManhoursYear;
newMonthReport.EmergencyManagementWorkDef = monthReport.EmergencyManagementWorkDef;
newMonthReport.MonthHdangerCount = monthReport.MonthHdangerCount;
newMonthReport.YearHdangerCount = monthReport.YearHdangerCount;
db.SubmitChanges();
}

14
SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
View File

@ -58,5 +58,19 @@ namespace BLL
db.Manager_PersonSortC.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
/// <summary>
/// 根据月报告主键删除对应的所有月报告HSE人力投入信息
/// </summary>
/// <param name="monthReportId">月报告主键</param>
public static void DeleteManager_HiddenDanger(string monthReportId)
{
var q = (from x in db.Manager_HiddenDanger where x.MonthReportId == monthReportId select x).ToList();
if (q.Count>0)
{
db.Manager_HiddenDanger.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
}
}

80
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
View File

@ -438,23 +438,74 @@
<f:Panel ID="Panel43" IsFluid="true" Title="4.3 本月隐患整改情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Grid ID="GridHiddenDanger" ShowBorder="true" ShowHeader="false" Title="本月隐患整改情况"
runat="server" AllowCellEditing="true" ClicksToEdit="1" DataIDField="Id"
DataKeyNames="Id,UnitId" EnableMultiSelect="false" ShowGridHeader="true"
MinHeight="220px" EnableColumnLines="true" EnableSummary="true"
SummaryPosition="Flow">
<Columns>
<f:TemplateField Width="250px" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left"
ColumnID="UnitId">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# ConvertUnitName(Eval("UnitId")) %>'
ToolTip='<%# ConvertUnitName(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Items>
</f:Panel>
<f:RenderField Width="160px" ColumnID="CommonlyNum" DataField="CommonlyNum" FieldType="Int"
HeaderText="一般隐患数" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:NumberBox ID="NumberBox10" NoDecimal="true" NoNegative="true" MinValue="0"
runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="MajorNum" DataField="MajorNum" FieldType="Int"
HeaderText="重大隐患数" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:NumberBox ID="NumberBox8" NoDecimal="true" NoNegative="true" MinValue="0"
runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ReRate" DataField="ReRate" FieldType="String"
HeaderText="隐患按时整改率" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:NumberBox ID="NumberBox9" NoDecimal="false" NoNegative="true" MinValue="0" DecimalPrecision="2"
runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
<f:Panel ID="Panel10" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextBox runat="server" ID="txtMonthHdangerCount" Label="本月隐患总数" LabelWidth="130px" Width="300px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtYearHdangerCount" Label="年度隐患总数" LabelWidth="130px" Width="300px" LabelAlign="Right"></f:TextBox>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Panel ID="Panel44" IsFluid="true" Title="4.4 项目作业许可管理数据" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
<f:Panel ID="Panel45" IsFluid="true" Title="4.5 项目本月危大工程管理数据" runat="server" EnableCollapse="false"
ShowHeader="true">
</Items>
<Items>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Panel ID="Panel45" IsFluid="true" Title="4.5 项目本月危大工程管理数据" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
<f:Panel ID="Panel46" IsFluid="true" Title="4.6 应急管理" runat="server" EnableCollapse="false"
ShowHeader="true">
@ -462,14 +513,12 @@
<f:Panel ID="Panel461" IsFluid="true" Title="4.6.1 应急预案发布情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
<f:Panel ID="Panel462" IsFluid="true" Title="4.6.2 应急演练工作情况说明" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
@ -645,14 +694,12 @@
<f:Panel ID="Panel611" IsFluid="true" Title="（1） 未遂事件统计" runat="server" EnableCollapse="false" CssStyle="position: relative;"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
<f:Panel ID="Panel612" IsFluid="true" Title="（2）本月伤害事故统计" runat="server" EnableCollapse="false" CssStyle="position: relative;"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
</Items>
@ -668,7 +715,6 @@
<f:Panel ID="Panel63" IsFluid="true" Title="6.3 HSE目标实现情况" runat="server" EnableCollapse="false" CssStyle="position: relative;"
ShowHeader="true">
<Items>
</Items>
</f:Panel>
</Items>
@ -772,10 +818,10 @@
<f:Panel ID="Panel9" IsFluid="true" Title="9.需协调解决的主要问题" runat="server" EnableCollapse="false" CssStyle="position: relative;"
ShowHeader="true">
<Items>
<f:TextArea runat="server" ID="txtQuestion" Label="" minHeight="420px" Width="800px">
</f:TextArea>
<f:TextArea runat="server" ID="txtQuestion" Label="" MinHeight="420px" Width="800px">
</f:TextArea>
<f:Label runat="server" ID="Label2" Text="备注：存在的主要问题及改进措施、 需要项目经理、项目主管、公司相关部门、业主协
<f:Label runat="server" ID="Label2" Text="备注：存在的主要问题及改进措施、 需要项目经理、项目主管、公司相关部门、业主协
调解决事宜。（简要说明项目HSE管理存在的主要问题和需要项目经理、项目主
管、公司相关部门、业主协调解决事宜，并提出具体改进措施和建议）。">
</f:Label>

215
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
View File

@ -7,6 +7,7 @@ using System.Web.UI.WebControls;
using BLL;
using Newtonsoft.Json.Linq;
using System.Threading;
using Model;
namespace FineUIPro.Web.HSSE.Manager
{
@ -92,6 +93,9 @@ namespace FineUIPro.Web.HSSE.Manager
private static List<Model.Manager_Month_ComplianceObligationsC> complianceObligationsCs = new List<Model.Manager_Month_ComplianceObligationsC>();
#endregion
public List<Project_ProjectUnit> units = new List<Project_ProjectUnit>();
public Model.SGGLDB db = Funs.DB;
#region 加载页面
@ -99,6 +103,12 @@ namespace FineUIPro.Web.HSSE.Manager
{
if (!IsPostBack)
{
ProjectId = CurrUser.LoginProjectId;
units = (from x in db.Project_ProjectUnit
where x.ProjectId == this.ProjectId && (x.UnitType == "1" || x.UnitType == "2")
orderby x.UnitType
select x).ToList(); //1为总包，2为施工分包
rewardAndPunishSortCs.Clear();
trainSorts.Clear();
checkSorts.Clear();
@ -107,7 +117,7 @@ namespace FineUIPro.Web.HSSE.Manager
otherWorkPlanCs.Clear();
complianceObligationsCs.Clear();
ProjectId = CurrUser.LoginProjectId;
unitList = db.Base_Unit.ToList();
MonthReportId = Request.Params["MonthReportId"];
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
@ -188,6 +198,11 @@ namespace FineUIPro.Web.HSSE.Manager
}
#endregion
#region 4.3隐患
txtMonthHdangerCount.Text = model.MonthHdangerCount.ToString();
txtYearHdangerCount.Text = model.YearHdangerCount.ToString();
#endregion
#region 4.6.3其他应急管理工作描述
txtEmergencyManagementWorkDef.Text = model.EmergencyManagementWorkDef;
#endregion
@ -404,6 +419,10 @@ namespace FineUIPro.Web.HSSE.Manager
monthReport.TotalHseManhours = Funs.GetNewIntOrZero(TotalHseManhours);
monthReport.TotalHseManhoursYear= Funs.GetNewIntOrZero(TotalYearHseManhours);
//4.3隐患
monthReport.MonthHdangerCount = Funs.GetNewIntOrZero(txtMonthHdangerCount.Text);
monthReport.YearHdangerCount = Funs.GetNewIntOrZero(txtYearHdangerCount.Text);
//4.6.3其他应急管理工作描述
monthReport.EmergencyManagementWorkDef = txtEmergencyManagementWorkDef.Text;
@ -432,6 +451,9 @@ namespace FineUIPro.Web.HSSE.Manager
//4.2
OperateCheckSort();
//4.3
OperateManager_HiddenDanger();
//4.7
OperateRewardAndPunishSort();
@ -478,6 +500,30 @@ namespace FineUIPro.Web.HSSE.Manager
}
#endregion
#region 4.3隐患整改
private void OperateManager_HiddenDanger() {
PersonSortCService.DeleteManager_HiddenDanger(MonthReportId);
JArray mergedData = GridHiddenDanger.GetMergedData();
foreach (JObject mergedRow in mergedData)
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
Model.Manager_HiddenDanger model = new Model.Manager_HiddenDanger
{
Id=Guid.NewGuid().ToString(),
MonthReportId = MonthReportId,
UnitId = this.GridHiddenDanger.Rows[i].DataKeys[1].ToString(),
CommonlyNum = Funs.GetNewIntOrZero(values.Value<string>("CommonlyNum").ToString()),
MajorNum = Funs.GetNewIntOrZero(values.Value<string>("MajorNum").ToString()),
ReRate = values.Value<string>("ReRate").ToString(),
SortIndex = i+1,
};
db.Manager_HiddenDanger.InsertOnSubmit(model);
db.SubmitChanges();
}
}
#endregion
#region 4.1保存培训
private void OperateTrainSort()
@ -792,6 +838,8 @@ namespace FineUIPro.Web.HSSE.Manager
GetTrainSort();
//4.2现场HSE绩效数据统计
GetCheckSort();
//4.3本月隐患
GetManager_HiddenDanger();
//4.7HSE奖励与处罚
GetRewardAndPunishSort();
@ -804,6 +852,9 @@ namespace FineUIPro.Web.HSSE.Manager
{
//2.本月项目现场HSE人力投入情况
GetPersonSortEdit();
//3.本月隐患
GetManager_HiddenDangerEdit();
}
}
@ -815,10 +866,10 @@ namespace FineUIPro.Web.HSSE.Manager
private void GetPersonSort()
{
List<Model.Manager_PersonSortC> personSorts = new List<Model.Manager_PersonSortC>();
var units = from x in Funs.DB.Project_ProjectUnit
where x.ProjectId == this.ProjectId && (x.UnitType == "1" || x.UnitType == "2")
orderby x.UnitType
select x; //1为总包，2为施工分包
//var units = from x in Funs.DB.Project_ProjectUnit
// where x.ProjectId == this.ProjectId && (x.UnitType == "1" || x.UnitType == "2")
// orderby x.UnitType
// select x; //1为总包，2为施工分包
int totalSumPersonNum = 0;//总部
int totalSumOutPersonNum = 0;//外聘
int totalHSEPersonNum = 0;
@ -874,10 +925,7 @@ namespace FineUIPro.Web.HSSE.Manager
orderby y.UnitType
select x).Distinct().ToList();
List<Model.Manager_PersonSortC> personSorts = new List<Model.Manager_PersonSortC>();
var units = from x in db.Project_ProjectUnit
where x.ProjectId == this.ProjectId && (x.UnitType == "1" || x.UnitType == "2")
orderby x.UnitType
select x; //1为总包，2为施工分包
foreach (var unit in units)
{
Model.Manager_PersonSortC personSort = sorts.FirstOrDefault(x => x.UnitId == unit.UnitId);
@ -1259,6 +1307,155 @@ namespace FineUIPro.Web.HSSE.Manager
}
#endregion
#region 4.3 本月隐患整改情况
void GetManager_HiddenDangerEdit() {
var q = from x in db.Manager_HiddenDanger
where x.MonthReportId == MonthReportId
select x;
if (q.Count() > 0) //保存过数据
{
//人力投入情况
List<Model.Manager_HiddenDanger> sorts = (from x in db.Manager_HiddenDanger
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where x.MonthReportId == MonthReportId && y.ProjectId == this.ProjectId
orderby y.UnitType
select x).Distinct().ToList();
List<Model.Manager_HiddenDanger> personSorts = new List<Model.Manager_HiddenDanger>();
//var units = from x in db.Project_ProjectUnit
// where x.ProjectId == this.ProjectId && (x.UnitType == "1" || x.UnitType == "2")
// orderby x.UnitType
// select x; //1为总包，2为施工分包
foreach (var unit in units)
{
Model.Manager_HiddenDanger personSort = sorts.FirstOrDefault(x => x.UnitId == unit.UnitId);
if (personSort != null)
{
personSorts.Add(personSort);
}
}
this.GridHiddenDanger.DataSource = personSorts;
this.GridHiddenDanger.DataBind();
}
else
{
GetManager_HiddenDanger();
}
}
//保存时根据 HSE巡检、专项检查、综合检查（即周检、月检等）、隐患整改（书面整改单）这四项同时抓取数据
void GetManager_HiddenDanger() {
//安全巡检list
var HseList = (from x in Funs.DB.View_Hazard_HazardRegister
where x.ProblemTypes == "1" && x.ProjectId == ProjectId && x.CheckTime>=startTime && x.CheckTime<=endTime
select x);
//专项检查
var CheckSpecialList = from x in db.Check_CheckSpecialDetail
join y in db.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
where y.ProjectId == ProjectId && y.CheckTime >= startTime && y.CheckTime <= endTime
select x;
//综合检查
var CheckColligationList = from x in db.Check_CheckColligationDetail
join y in db.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
where y.ProjectId == ProjectId && y.CheckTime >= startTime && y.CheckTime <= endTime
select x;
//隐患整改单
var YhzgdList = from x in db.Check_RectifyNoticesItem
join y in db.Check_RectifyNotices on x.RectifyNoticesId equals y.RectifyNoticesId
where y.ProjectId == ProjectId && y.CheckedDate >= startTime && y.CheckedDate <= endTime
select new { y.UnitId, x.HiddenHazardType,y.States};
int yhMonthSum = 0, yhYearSum = 0;
var list = new List<Model.Manager_HiddenDanger>();
if (units.Count() > 0)
{
var i = 1;
foreach (Model.Project_ProjectUnit u in units)
{
var model = new Manager_HiddenDanger
{
Id=Guid.NewGuid().ToString(),
UnitId = u.UnitId,
SortIndex= i
};
//HSE巡检(一般和重大)
//所有数据
var Commonly1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.Risk_Level=="一般" && x.States == "2").Count();
var MajorNum1= HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.Risk_Level == "重大" && x.States == "2").Count();
//总数，已整改
var Sum1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0).Count();
var Yzg1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.States == "2").Count();
//专项检查(一般和重大)
var Commonly2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "1" && x.CompleteStatus == true).Count();
var MajorNum2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "3" && x.CompleteStatus == true).Count();
//总数，已整改
var Sum2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId).Count();
var Yzg2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.CompleteStatus==true).Count();
//综合检查(一般和重大)
var Commonly3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "一般" && x.CompleteStatus == true).Count();
var MajorNum3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "重大" && x.CompleteStatus == true).Count();
//总数，已整改
var Sum3 = CheckColligationList.Where(x => x.UnitId == u.UnitId).Count();
var Yzg3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.CompleteStatus == true).Count();
//隐患整改(一般和重大)
var Commonly4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "一般" && x.States == "5").Count();
var MajorNum4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "重大" && x.States == "5").Count();
//总数，已整改
var Sum4 = YhzgdList.Where(x => x.UnitId == u.UnitId).Count();
var Yzg4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.States == "5").Count();
model.CommonlyNum = Commonly1+ Commonly2+ Commonly3+ Commonly4;
model.MajorNum = MajorNum1+ MajorNum2+ MajorNum3+ MajorNum4;
//整改率=已整改/总数
if ((Sum1 + Sum2 + Sum3 + Sum4) != 0)
{
model.ReRate = Math.Round((float)(Yzg1 + Yzg2 + Yzg3 + Yzg4) / (float)(Sum1 + Sum2 + Sum3 + Sum4) * 100, 2).ToString();
}
else {
model.ReRate = "0";
}
yhMonthSum += Sum1 + Sum2 + Sum3 + Sum4;
list.Add(model);
i++;
}
}
txtMonthHdangerCount.Text = yhMonthSum.ToString();
this.GridHiddenDanger.DataSource = list;
this.GridHiddenDanger.DataBind();
#region 本年隐患总数
//安全巡检list
var HseListYear = (from x in Funs.DB.View_Hazard_HazardRegister
where x.ProblemTypes == "1" && x.ProjectId == ProjectId && x.CheckTime >= yearStartTime && x.CheckTime <= endTime
select x).ToList().Count;
//专项检查
var CheckSpecialListYear = (from x in db.Check_CheckSpecialDetail
join y in db.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
where y.ProjectId == ProjectId && y.CheckTime >= yearStartTime && y.CheckTime <= endTime
select x).ToList().Count;
//综合检查
var CheckColligationListYear = (from x in db.Check_CheckColligationDetail
join y in db.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
where y.ProjectId == ProjectId && y.CheckTime >= yearStartTime && y.CheckTime <= endTime
select x).ToList().Count;
//隐患整改单
var YhzgdListYear = (from x in db.Check_RectifyNoticesItem
join y in db.Check_RectifyNotices on x.RectifyNoticesId equals y.RectifyNoticesId
where y.ProjectId == ProjectId && y.CheckedDate >= yearStartTime && y.CheckedDate <= endTime
select new { y.UnitId, x.HiddenHazardType, y.States }).ToList().Count;
txtYearHdangerCount.Text = (HseListYear + CheckSpecialListYear + CheckColligationListYear + YhzgdListYear).ToString();
#endregion
}
#endregion
#region 4.7 HSE奖励与处罚
private void GetRewardAndPunishSort()
{

72
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs generated
View File

@ -572,6 +572,78 @@ namespace FineUIPro.Web.HSSE.Manager
/// </remarks>
protected global::FineUIPro.Panel Panel43;
/// <summary>
/// GridHiddenDanger 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid GridHiddenDanger;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// NumberBox10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox NumberBox10;
/// <summary>
/// NumberBox8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox NumberBox8;
/// <summary>
/// NumberBox9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox NumberBox9;
/// <summary>
/// Panel10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel10;
/// <summary>
/// txtMonthHdangerCount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMonthHdangerCount;
/// <summary>
/// txtYearHdangerCount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtYearHdangerCount;
/// <summary>
/// Panel44 控件。
/// </summary>

1
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
View File

@ -238,6 +238,7 @@ namespace FineUIPro.Web.HSSE.Manager
var mont = BLL.MonthReportCService.GetMonthReportByMonthReportId(rowID);
if (mont != null)
{
PersonSortCService.DeleteManager_HiddenDanger(rowID);
BLL.ComplianceObligationsCService.DeleteComplianceObligationsCByMonthReportId(rowID);
BLL.RewardAndPunishSortCService.DeleteRewardAndPunishSortCByMonthReportId(rowID);
BLL.PersonSortCService.DeletePersonSortsByMonthReportId(rowID);

265
SGGL/Model/Model.cs
View File

@ -1445,6 +1445,9 @@ namespace Model
partial void InsertManager_HazardSortC(Manager_HazardSortC instance);
partial void UpdateManager_HazardSortC(Manager_HazardSortC instance);
partial void DeleteManager_HazardSortC(Manager_HazardSortC instance);
partial void InsertManager_HiddenDanger(Manager_HiddenDanger instance);
partial void UpdateManager_HiddenDanger(Manager_HiddenDanger instance);
partial void DeleteManager_HiddenDanger(Manager_HiddenDanger instance);
partial void InsertManager_HseCostC(Manager_HseCostC instance);
partial void UpdateManager_HseCostC(Manager_HseCostC instance);
partial void DeleteManager_HseCostC(Manager_HseCostC instance);
@ -6515,6 +6518,14 @@ namespace Model
}
}
public System.Data.Linq.Table<Manager_HiddenDanger> Manager_HiddenDanger
{
get
{
return this.GetTable<Manager_HiddenDanger>();
}
}
public System.Data.Linq.Table<Manager_HseCostC> Manager_HseCostC
{
get
@ -234627,6 +234638,212 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_HiddenDanger")]
public partial class Manager_HiddenDanger : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _MonthReportId;
private string _UnitId;
private System.Nullable<int> _CommonlyNum;
private System.Nullable<int> _MajorNum;
private string _ReRate;
private System.Nullable<int> _SortIndex;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnMonthReportIdChanging(string value);
partial void OnMonthReportIdChanged();
partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged();
partial void OnCommonlyNumChanging(System.Nullable<int> value);
partial void OnCommonlyNumChanged();
partial void OnMajorNumChanging(System.Nullable<int> value);
partial void OnMajorNumChanged();
partial void OnReRateChanging(string value);
partial void OnReRateChanged();
partial void OnSortIndexChanging(System.Nullable<int> value);
partial void OnSortIndexChanged();
#endregion
public Manager_HiddenDanger()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")]
public string MonthReportId
{
get
{
return this._MonthReportId;
}
set
{
if ((this._MonthReportId != value))
{
this.OnMonthReportIdChanging(value);
this.SendPropertyChanging();
this._MonthReportId = value;
this.SendPropertyChanged("MonthReportId");
this.OnMonthReportIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
public string UnitId
{
get
{
return this._UnitId;
}
set
{
if ((this._UnitId != value))
{
this.OnUnitIdChanging(value);
this.SendPropertyChanging();
this._UnitId = value;
this.SendPropertyChanged("UnitId");
this.OnUnitIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CommonlyNum", DbType="Int")]
public System.Nullable<int> CommonlyNum
{
get
{
return this._CommonlyNum;
}
set
{
if ((this._CommonlyNum != value))
{
this.OnCommonlyNumChanging(value);
this.SendPropertyChanging();
this._CommonlyNum = value;
this.SendPropertyChanged("CommonlyNum");
this.OnCommonlyNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MajorNum", DbType="Int")]
public System.Nullable<int> MajorNum
{
get
{
return this._MajorNum;
}
set
{
if ((this._MajorNum != value))
{
this.OnMajorNumChanging(value);
this.SendPropertyChanging();
this._MajorNum = value;
this.SendPropertyChanged("MajorNum");
this.OnMajorNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReRate", DbType="NVarChar(50)")]
public string ReRate
{
get
{
return this._ReRate;
}
set
{
if ((this._ReRate != value))
{
this.OnReRateChanging(value);
this.SendPropertyChanging();
this._ReRate = value;
this.SendPropertyChanged("ReRate");
this.OnReRateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
public System.Nullable<int> SortIndex
{
get
{
return this._SortIndex;
}
set
{
if ((this._SortIndex != value))
{
this.OnSortIndexChanging(value);
this.SendPropertyChanging();
this._SortIndex = value;
this.SendPropertyChanged("SortIndex");
this.OnSortIndexChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_HseCostC")]
public partial class Manager_HseCostC : INotifyPropertyChanging, INotifyPropertyChanged
{
@ -245077,6 +245294,10 @@ namespace Model
private System.Nullable<int> _TotalHseManhoursYear;
private System.Nullable<int> _MonthHdangerCount;
private System.Nullable<int> _YearHdangerCount;
private EntitySet<Manager_AccidentSortC> _Manager_AccidentSortC;
private EntitySet<Manager_CheckDetailSortC> _Manager_CheckDetailSortC;
@ -245365,6 +245586,10 @@ namespace Model
partial void OnEndDateChanged();
partial void OnTotalHseManhoursYearChanging(System.Nullable<int> value);
partial void OnTotalHseManhoursYearChanged();
partial void OnMonthHdangerCountChanging(System.Nullable<int> value);
partial void OnMonthHdangerCountChanged();
partial void OnYearHdangerCountChanging(System.Nullable<int> value);
partial void OnYearHdangerCountChanged();
#endregion
public Manager_MonthReportC()
@ -247441,6 +247666,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthHdangerCount", DbType="Int")]
public System.Nullable<int> MonthHdangerCount
{
get
{
return this._MonthHdangerCount;
}
set
{
if ((this._MonthHdangerCount != value))
{
this.OnMonthHdangerCountChanging(value);
this.SendPropertyChanging();
this._MonthHdangerCount = value;
this.SendPropertyChanged("MonthHdangerCount");
this.OnMonthHdangerCountChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YearHdangerCount", DbType="Int")]
public System.Nullable<int> YearHdangerCount
{
get
{
return this._YearHdangerCount;
}
set
{
if ((this._YearHdangerCount != value))
{
this.OnYearHdangerCountChanging(value);
this.SendPropertyChanging();
this._YearHdangerCount = value;
this.SendPropertyChanged("YearHdangerCount");
this.OnYearHdangerCountChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_AccidentCSort_Manager_MonthReport", Storage="_Manager_AccidentSortC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
public EntitySet<Manager_AccidentSortC> Manager_AccidentSortC
{