From ba55ac64e4dfb01f4ba255868bcd5763359b494a Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Mon, 26 Aug 2024 14:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=94=E7=8E=AF=E5=AE=89?=
=?UTF-8?q?=E5=85=A8=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/SGGLDB_WH_V2024-08-23-phf.sql | 5 +-
.../ManagerMonthC/MonthReportCService.cs | 4 +
.../ManagerMonthC/PersonSortCService.cs | 14 +
.../HSSE/Manager/ManagerMonthCEdit.aspx | 80 ++++--
.../HSSE/Manager/ManagerMonthCEdit.aspx.cs | 215 +++++++++++++-
.../ManagerMonthCEdit.aspx.designer.cs | 72 +++++
.../HSSE/Manager/ManagerMonthCNew.aspx.cs | 1 +
SGGL/Model/Model.cs | 265 ++++++++++++++++++
8 files changed, 628 insertions(+), 28 deletions(-)
diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql
index a9a94542..93a9e8db 100644
--- a/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql
@@ -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];
\ No newline at end of file
+) ON [PRIMARY];
+
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs
index f7dce2d0..9a910271 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs
@@ -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();
}
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
index d57b308e..ab639ede 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
@@ -58,5 +58,19 @@ namespace BLL
db.Manager_PersonSortC.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
+
+ ///
+ /// 根据月报告主键删除对应的所有月报告HSE人力投入信息
+ ///
+ /// 月报告主键
+ 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();
+ }
+ }
}
}
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
index 29e0a993..da85dd3f 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
@@ -438,23 +438,74 @@
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
+
+
+
+
+
+
+
@@ -462,14 +513,12 @@
-
-
@@ -645,14 +694,12 @@
-
-
@@ -668,7 +715,6 @@
-
@@ -772,10 +818,10 @@
-
-
+
+
-
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
index e8522b00..65e86e06 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
@@ -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 complianceObligationsCs = new List();
#endregion
+
+ public List units = new List();
+
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("status");
+ JObject values = mergedRow.Value("values");
+ int i = mergedRow.Value("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("CommonlyNum").ToString()),
+ MajorNum = Funs.GetNewIntOrZero(values.Value("MajorNum").ToString()),
+ ReRate = values.Value("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 personSorts = new List();
- 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 personSorts = new List();
- 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 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 personSorts = new List();
+ //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();
+ 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()
{
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs
index beae36a1..2b08c9ea 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs
@@ -572,6 +572,78 @@ namespace FineUIPro.Web.HSSE.Manager
///
protected global::FineUIPro.Panel Panel43;
+ ///
+ /// GridHiddenDanger 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid GridHiddenDanger;
+
+ ///
+ /// Label5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label5;
+
+ ///
+ /// NumberBox10 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox NumberBox10;
+
+ ///
+ /// NumberBox8 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox NumberBox8;
+
+ ///
+ /// NumberBox9 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox NumberBox9;
+
+ ///
+ /// Panel10 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel10;
+
+ ///
+ /// txtMonthHdangerCount 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtMonthHdangerCount;
+
+ ///
+ /// txtYearHdangerCount 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtYearHdangerCount;
+
///
/// Panel44 控件。
///
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
index 142e1825..1d042c53 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
@@ -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);
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index d5035afe..05943ff1 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -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
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table 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 _CommonlyNum;
+
+ private System.Nullable _MajorNum;
+
+ private string _ReRate;
+
+ private System.Nullable _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 value);
+ partial void OnCommonlyNumChanged();
+ partial void OnMajorNumChanging(System.Nullable value);
+ partial void OnMajorNumChanged();
+ partial void OnReRateChanging(string value);
+ partial void OnReRateChanged();
+ partial void OnSortIndexChanging(System.Nullable 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 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 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 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 _TotalHseManhoursYear;
+ private System.Nullable _MonthHdangerCount;
+
+ private System.Nullable _YearHdangerCount;
+
private EntitySet _Manager_AccidentSortC;
private EntitySet _Manager_CheckDetailSortC;
@@ -245365,6 +245586,10 @@ namespace Model
partial void OnEndDateChanged();
partial void OnTotalHseManhoursYearChanging(System.Nullable value);
partial void OnTotalHseManhoursYearChanged();
+ partial void OnMonthHdangerCountChanging(System.Nullable value);
+ partial void OnMonthHdangerCountChanged();
+ partial void OnYearHdangerCountChanging(System.Nullable 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 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 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
{