20231110优化安全巡检、作业票列表速度优化

DataBase/版本日志/SGGLDB_V2023-11-10.sql

@@ -0,0 +1,45 @@
+CREATE VIEW [dbo].[View_Hazard_HazardRegisterList]
+AS
+/**********°²È«Ñ²¼ìÊÓͼ*************/
+SELECT 	Registration.ProjectId, 
+	Registration.HazardRegisterId, 
+	Registration.ResponsibleUnit, 
+	Registration.CheckTime,
+	Registration.ProblemTypes, 
+	User2.PersonName AS CheckManName,
+	RegisterTypes.RegisterTypesName,
+	ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
+	Unit.UnitName AS ResponsibilityUnitName,
+	Registration.RectificationTime,
+	Registration.states,
+	Registration.RegisterDef, 
+	Registration.HazardValue,
+	Registration.RegisterTypes2Id ,
+	RegisterTypes2.RegisterTypesName as RegisterTypes2Name,
+	Registration.RegisterTypes3Id ,
+	RegisterTypes3.RegisterTypesName as RegisterTypes3Name,
+	Registration.RegisterTypes4Id ,
+	RegisterTypes4.RegisterTypesName as RegisterTypes4Name,
+	User1.PersonName AS ResponsibilityManName,
+	User2.UnitId AS SendUnitId,
+	Registration.Rectification, 
+	Registration.RectificationPeriod,
+	Registration.RegisterDate, 
+	(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä' 
+		  WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ' 
+		  WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä' 
+		  WHEN Registration.states='3' THEN 'Òѱջ·' ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr
+FROM dbo.HSSE_Hazard_HazardRegister AS Registration
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId 
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes2 ON RegisterTypes2.RegisterTypesId = Registration.RegisterTypes2Id 
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes3 ON RegisterTypes3.RegisterTypesId = Registration.RegisterTypes3Id 
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes4 ON RegisterTypes4.RegisterTypesId = Registration.RegisterTypes4Id 
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
+LEFT JOIN dbo.Person_Persons AS User1 ON User1.PersonId = Registration.ResponsibleMan   
+LEFT JOIN dbo.Person_Persons AS User2 ON User2.PersonId = Registration.CheckManId
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place 
+
+GO
+
+

SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -1,7 +1,8 @@
-using System;
+using FineUIPro;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.UI.WebControls;
 
 namespace BLL
 {
@@ -9,6 +10,124 @@ namespace BLL
     {
         public static Model.SGGLDB db = Funs.DB;
 
+        #region 获取安全巡检列表信息
+        /// <summary>
+        /// 记录数
+        /// </summary>
+        public static int count
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.View_Hazard_HazardRegisterList> getDataLists = from x in db.View_Hazard_HazardRegisterList
+                                                                                       where x.ProblemTypes == "1"
+                                                                                   select x;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projetcId"></param>
+        /// <param name="checkMan"></param>
+        /// <param name="type"></param>
+        /// <param name="workAreaName"></param>
+        /// <param name="responsibilityUnitName"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="startRectificationTime"></param>
+        /// <param name="endRectificationTime"></param>
+        /// <param name="states"></param>
+        /// <param name="personId"></param>
+        /// <param name="unitId"></param>
+        /// <param name="Grid1"></param>
+        /// <returns></returns>
+        public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime
+            ,string states, string personId, string unitId, Grid Grid1)
+        {
+            IQueryable<Model.View_Hazard_HazardRegisterList> getDataList = getDataLists;
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                getDataList = getDataList.Where(e => e.ProjectId == projectId);
+            }
+            if (!string.IsNullOrEmpty(checkMan))
+            {
+                getDataList = getDataList.Where(e => e.CheckManName.Contains(checkMan));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                getDataList = getDataList.Where(e => e.RegisterTypesName.Contains(type));
+            }
+
+            if (!string.IsNullOrEmpty(workAreaName))
+            {
+                getDataList = getDataList.Where(e => e.WorkAreaName.Contains(workAreaName));
+            }
+            if (!string.IsNullOrEmpty(responsibilityUnitName))
+            {
+                getDataList = getDataList.Where(e => e.ResponsibilityUnitName.Contains(responsibilityUnitName));
+            }
+            if (startTime.HasValue)
+            {
+                getDataList = getDataList.Where(e => e.CheckTime >= startTime);
+            }
+            if (endTime.HasValue)
+            {
+                getDataList = getDataList.Where(e => e.CheckTime <= endTime);
+            }
+
+            if (startRectificationTime.HasValue)
+            {
+                getDataList = getDataList.Where(e => e.RectificationTime >= startRectificationTime);
+            }
+            if (endRectificationTime.HasValue)
+            {
+                getDataList = getDataList.Where(e => e.RectificationTime <= endRectificationTime);
+            }
+
+            if (!string.IsNullOrEmpty(states) && states != Const._Null)
+            {
+                getDataList = getDataList.Where(e => e.States.Contains(states));
+            }
+
+            if (!CommonService.IsMainUnitOrAdmin(personId))
+            {               
+                getDataList = getDataList.Where(e => e.ResponsibleUnit == unitId || e.SendUnitId == unitId);
+            }
+
+            count = getDataList.Count();
+            if (count == 0)
+            {
+                return null;
+            }
+            getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+            return from x in getDataList
+                   select new
+                   {
+                       x.HazardRegisterId,
+                       x.CheckTime,
+                       x.RegisterDef,
+                       x.RegisterTypes2Name,
+                       x.RegisterTypesName,
+                       x.RegisterTypes3Name,
+                       x.HazardValue,
+                       x.RegisterTypes4Name,
+                       x.WorkAreaName,
+                       x.ResponsibilityUnitName,
+                       x.ResponsibilityManName,
+                       x.Rectification,
+                       x.RectificationPeriod,
+                       //x.CCManNames,
+                       x.RectificationTime,
+                       x.CheckManName,
+                       x.RegisterDate,
+                       x.StatesStr,
+                   };
+        }
+        #endregion
+
         /// <summary>
         /// 根据危险观察登记主键获取危险观察登记信息
         /// </summary>

SGGL/BLL/HSSE/License/LicenseManagerService.cs

@@ -1,4 +1,10 @@
-using System;
+using FineUIPro;
+using Model;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 
 namespace BLL
@@ -10,6 +16,120 @@ namespace BLL
     {
         public static Model.SGGLDB db = Funs.DB;
 
+        #region 获取安全巡检列表信息
+        /// <summary>
+        /// 记录数
+        /// </summary>
+        public static int count
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.License_LicenseManager> getDataLists = from x in db.License_LicenseManager
+                                                                                       select x;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projetcId"></param>
+        /// <param name="checkMan"></param>
+        /// <param name="type"></param>
+        /// <param name="workAreaName"></param>
+        /// <param name="responsibilityUnitName"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="startRectificationTime"></param>
+        /// <param name="endRectificationTime"></param>
+        /// <param name="states"></param>
+        /// <param name="personId"></param>
+        /// <param name="unitId"></param>
+        /// <param name="Grid1"></param>
+        /// <returns></returns>
+        public static IEnumerable getListData(string projectId, string unitId, DateTime? startTime, DateTime? endTime, string licenseType, string unitId2,  Grid Grid1)
+        {
+            IQueryable<Model.License_LicenseManager> getDataList = getDataLists;
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                getDataList = getDataList.Where(e => e.ProjectId == projectId);
+            }
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId))
+            {
+                getDataList = getDataList.Where(e => e.UnitId == unitId);
+            }
+            if (startTime.HasValue)
+            {
+                getDataList = getDataList.Where(e => e.StartDate >= startTime);
+            }
+            if (endTime.HasValue)
+            {
+                getDataList = getDataList.Where(e => e.EndDate <= endTime);
+            }
+            if (!string.IsNullOrEmpty(licenseType))
+            {
+                getDataList = getDataList.Where(e => e.LicenseTypeId == licenseType);
+            }                     
+
+            if (!string.IsNullOrEmpty(unitId2) && unitId2 != Const._Null)
+            {
+                getDataList = getDataList.Where(e => e.UnitId == unitId2 );
+            }
+
+
+            count = getDataList.Count();
+            if (count == 0)
+            {
+                return null;
+            }
+            getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+            return from x in getDataList
+                   select new
+                   {
+                       x.LicenseManagerId,
+                       x.LicenseManagerCode,
+                       LicenseTypeName = db.Base_LicenseType.First(t => t.LicenseTypeId == x.LicenseTypeId).LicenseTypeName,
+                       UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
+                       WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
+                       x.CompileDate,
+                       x.StartDate,
+                       x.EndDate,
+                       FlowOperateName = getFlow(x.LicenseManagerId, x.States),
+                   };
+        }
+
+        public static string getFlow(string id,string states)
+        {
+            string strrValue = string.Empty;
+            string name = string.Empty;
+            var getFlow = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == id && x.IsClosed != true);
+            if (getFlow != null)
+            {
+                var getPerson = Funs.DB.Person_Persons.FirstOrDefault(x => x.PersonId == getFlow.OperaterId);
+                if (getPerson != null)
+                {
+                    name = getPerson.PersonName;
+                }
+            }
+
+            if (states == BLL.Const.State_0 || string.IsNullOrEmpty(states))
+            {
+                strrValue = "待[" + name + "]提交";
+            }
+            else if (states == BLL.Const.State_1)
+            {
+                strrValue = "审核/审批完成";
+            } else
+            {
+                strrValue = "待[" + name + "]办理";
+            }
+
+            return strrValue;
+        }
+        #endregion
+
         /// <summary>
         /// 根据主键获取安全许可证
         /// </summary>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx

@@ -119,9 +119,9 @@
                         SortField="RectificationPeriod" FieldType="Date" Renderer="Date" HeaderText="整改期限"
                         TextAlign="Center" HeaderTextAlign="Center">
                     </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="CCManNames" DataField="CCManNames"
+                <%--    <f:RenderField Width="120px" ColumnID="CCManNames" DataField="CCManNames"
                         FieldType="String" HeaderText="抄送" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
+                    </f:RenderField>--%>
                     <f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
                         SortField="RectificationTime" HeaderText="整改时间" TextAlign="Left" HeaderTextAlign="Center">
                     </f:RenderField>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs

@@ -57,76 +57,84 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
         /// </summary>
         private void BindGrid()
         {
-            string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' ";
+            //string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
+            //List<SqlParameter> listStr = new List<SqlParameter>();
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
-            {
-                strSql += " AND ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            }
-            if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim()))
-            {
-                strSql += " AND CheckManName LIKE @CheckMan";
-                listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
-            }
-            if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
-            {
-                strSql += " AND RegisterTypesName LIKE @Type";
-                listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
-            }
-            if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
-            {
-                strSql += " AND WorkAreaName LIKE @WorkAreaName";
-                listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%"));
-            }
-            //if (this.ckType.SelectedValue != "0")
             //{
-            //    strSql += " AND CheckCycle=@CheckCycle";
+            //    strSql += " AND ProjectId = @ProjectId";
-            //    listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue));
+            //    listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             //}
-            if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim()))
-            {
+            //{
-                strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName";
+            //    strSql += " AND CheckManName LIKE @CheckMan";
-                listStr.Add(new SqlParameter("@ResponsibilityUnitName", "%" + this.txtResponsibilityUnitName.Text.Trim() + "%"));
+            //    listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
-            }
+            //}
-            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
-            {
+            //{
-                strSql += " AND CheckTime >= @StartTime";
+            //    strSql += " AND RegisterTypesName LIKE @Type";
-                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            //    listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
-            }
+            //}
-            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
-            {
+            //{
-                strSql += " AND CheckTime <= @EndTime";
+            //    strSql += " AND WorkAreaName LIKE @WorkAreaName";
-                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            //    listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%"));
-            }
+            //}
-            if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim()))
+            ////if (this.ckType.SelectedValue != "0")
-            {
+            ////{
-                strSql += " AND RectificationTime >= @StartRectificationTime";
+            ////    strSql += " AND CheckCycle=@CheckCycle";
-                listStr.Add(new SqlParameter("@StartRectificationTime", this.txtStartRectificationTime.Text.Trim()));
+            ////    listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue));
-            }
+            ////}
-            if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim()))
-            {
+            //{
-                strSql += " AND RectificationTime <= @EndRectificationTime";
+            //    strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName";
-                listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim()));
+            //    listStr.Add(new SqlParameter("@ResponsibilityUnitName", "%" + this.txtResponsibilityUnitName.Text.Trim() + "%"));
-            }
+            //}
-            if (this.drpStates.SelectedValue != BLL.Const._Null)
+            //if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
-            {
+            //{
-                strSql += " AND States LIKE @States";
+            //    strSql += " AND CheckTime >= @StartTime";
-                listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%"));
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
-            }
+            //}
-            if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId))
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
-            {
+            //{
-                strSql += " AND (ResponsibleUnit =@ResponsibleUnit OR SendUnitId=@SendUnitId)";
+            //    strSql += " AND CheckTime <= @EndTime";
-                listStr.Add(new SqlParameter("@ResponsibleUnit", this.CurrUser.UnitId));
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
-                listStr.Add(new SqlParameter("@SendUnitId", this.CurrUser.UnitId));
+            //}
-            }
+            //if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim()))
-            SqlParameter[] parameter = listStr.ToArray();
+            //{
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            //    strSql += " AND RectificationTime >= @StartRectificationTime";
+            //    listStr.Add(new SqlParameter("@StartRectificationTime", this.txtStartRectificationTime.Text.Trim()));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
+            //{
+            //    strSql += " AND RectificationTime <= @EndRectificationTime";
+            //    listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim()));
+            //}
+            //if (this.drpStates.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND States LIKE @States";
+            //    listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%"));
+            //}
+            //if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId))
+            //{
+            //    strSql += " AND (ResponsibleUnit =@ResponsibleUnit OR SendUnitId=@SendUnitId)";
+            //    listStr.Add(new SqlParameter("@ResponsibleUnit", this.CurrUser.UnitId));
+            //    listStr.Add(new SqlParameter("@SendUnitId", this.CurrUser.UnitId));
+            //}
+            //SqlParameter[] parameter = listStr.ToArray();
+            //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
-            Grid1.RecordCount = tb.Rows.Count;
+            //Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
+            //var table = this.GetPagedDataTable(Grid1, tb);
 
-            Grid1.DataSource = table;
+            //Grid1.DataSource = table;
+            //Grid1.DataBind();
+
+
+            var getData = HSSE_Hazard_HazardRegisterService.getListData(this.CurrUser.LoginProjectId, this.txtCheckMan.Text.Trim(), this.txtType.Text.Trim(), this.txtWorkAreaName.Text.Trim(),
+                this.txtResponsibilityUnitName.Text.Trim(),Funs.GetNewDateTime(txtStartTime.Text.Trim()),Funs.GetNewDateTime(this.txtEndTime.Text.Trim()), Funs.GetNewDateTime(this.txtStartRectificationTime.Text.Trim()), Funs.GetNewDateTime(this.txtEndRectificationTime.Text.Trim()),
+                this.drpStates.SelectedValue, this.CurrUser.PersonId, this.CurrUser.UnitId, Grid1);
+            Grid1.RecordCount = HSSE_Hazard_HazardRegisterService.count;
+            Grid1.DataSource = getData;
             Grid1.DataBind();
         }
         #endregion

SGGL/Model/Model.cs

@@ -6409,6 +6409,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_Hazard_HazardRegisterList> View_Hazard_HazardRegisterList
+		{
+			get
+			{
+				return this.GetTable<View_Hazard_HazardRegisterList>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_HJGL_Batch_PointBatch> View_HJGL_Batch_PointBatch
 		{
 			get
@@ -39519,10 +39527,10 @@ namespace Model
 		
 		private string _SaveHandleMan;
 		
-		private string _WorkPackageId;
-		
 		private string _WorkPackageName;
 		
+		private string _WorkPackageId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Person_Persons> _Person_Persons;
@@ -39579,10 +39587,10 @@ namespace Model
     partial void OnProposeUnitIdChanged();
     partial void OnSaveHandleManChanging(string value);
     partial void OnSaveHandleManChanged();
-    partial void OnWorkPackageIdChanging(string value);
-    partial void OnWorkPackageIdChanged();
     partial void OnWorkPackageNameChanging(string value);
     partial void OnWorkPackageNameChanged();
+    partial void OnWorkPackageIdChanging(string value);
+    partial void OnWorkPackageIdChanged();
     #endregion
 		
 		public Check_CheckControl()
@@ -40061,26 +40069,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
-		public string WorkPackageId
-		{
-			get
-			{
-				return this._WorkPackageId;
-			}
-			set
-			{
-				if ((this._WorkPackageId != value))
-				{
-					this.OnWorkPackageIdChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackageId = value;
-					this.SendPropertyChanged("WorkPackageId");
-					this.OnWorkPackageIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
 		public string WorkPackageName
 		{
@@ -40101,6 +40089,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
+		public string WorkPackageId
+		{
+			get
+			{
+				return this._WorkPackageId;
+			}
+			set
+			{
+				if ((this._WorkPackageId != value))
+				{
+					this.OnWorkPackageIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageId = value;
+					this.SendPropertyChanged("WorkPackageId");
+					this.OnWorkPackageIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -100751,10 +100759,10 @@ namespace Model
 		
 		private string _HazardValue;
 		
-		private string _WorkPackageId;
-		
 		private string _WorkPackageName;
 		
+		private string _WorkPackageId;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -100855,10 +100863,10 @@ namespace Model
     partial void OnRegisterTypes4IdChanged();
     partial void OnHazardValueChanging(string value);
     partial void OnHazardValueChanged();
-    partial void OnWorkPackageIdChanging(string value);
-    partial void OnWorkPackageIdChanged();
     partial void OnWorkPackageNameChanging(string value);
     partial void OnWorkPackageNameChanged();
+    partial void OnWorkPackageIdChanging(string value);
+    partial void OnWorkPackageIdChanged();
     #endregion
 		
 		public HSSE_Hazard_HazardRegister()
@@ -101796,26 +101804,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
-		public string WorkPackageId
-		{
-			get
-			{
-				return this._WorkPackageId;
-			}
-			set
-			{
-				if ((this._WorkPackageId != value))
-				{
-					this.OnWorkPackageIdChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackageId = value;
-					this.SendPropertyChanged("WorkPackageId");
-					this.OnWorkPackageIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
 		public string WorkPackageName
 		{
@@ -101836,6 +101824,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
+		public string WorkPackageId
+		{
+			get
+			{
+				return this._WorkPackageId;
+			}
+			set
+			{
+				if ((this._WorkPackageId != value))
+				{
+					this.OnWorkPackageIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageId = value;
+					this.SendPropertyChanged("WorkPackageId");
+					this.OnWorkPackageIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -268078,6 +268086,465 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Hazard_HazardRegisterList")]
+	public partial class View_Hazard_HazardRegisterList
+	{
+		
+		private string _ProjectId;
+		
+		private string _HazardRegisterId;
+		
+		private string _ResponsibleUnit;
+		
+		private System.Nullable<System.DateTime> _CheckTime;
+		
+		private string _ProblemTypes;
+		
+		private string _CheckManName;
+		
+		private string _RegisterTypesName;
+		
+		private string _WorkAreaName;
+		
+		private string _ResponsibilityUnitName;
+		
+		private System.Nullable<System.DateTime> _RectificationTime;
+		
+		private string _States;
+		
+		private string _RegisterDef;
+		
+		private string _HazardValue;
+		
+		private string _RegisterTypes2Id;
+		
+		private string _RegisterTypes2Name;
+		
+		private string _RegisterTypes3Id;
+		
+		private string _RegisterTypes3Name;
+		
+		private string _RegisterTypes4Id;
+		
+		private string _RegisterTypes4Name;
+		
+		private string _ResponsibilityManName;
+		
+		private string _SendUnitId;
+		
+		private string _Rectification;
+		
+		private System.Nullable<System.DateTime> _RectificationPeriod;
+		
+		private System.Nullable<System.DateTime> _RegisterDate;
+		
+		private string _StatesStr;
+		
+		public View_Hazard_HazardRegisterList()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardRegisterId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string HazardRegisterId
+		{
+			get
+			{
+				return this._HazardRegisterId;
+			}
+			set
+			{
+				if ((this._HazardRegisterId != value))
+				{
+					this._HazardRegisterId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
+		public string ResponsibleUnit
+		{
+			get
+			{
+				return this._ResponsibleUnit;
+			}
+			set
+			{
+				if ((this._ResponsibleUnit != value))
+				{
+					this._ResponsibleUnit = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CheckTime
+		{
+			get
+			{
+				return this._CheckTime;
+			}
+			set
+			{
+				if ((this._CheckTime != value))
+				{
+					this._CheckTime = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemTypes", DbType="Char(1)")]
+		public string ProblemTypes
+		{
+			get
+			{
+				return this._ProblemTypes;
+			}
+			set
+			{
+				if ((this._ProblemTypes != value))
+				{
+					this._ProblemTypes = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckManName", DbType="NVarChar(200)")]
+		public string CheckManName
+		{
+			get
+			{
+				return this._CheckManName;
+			}
+			set
+			{
+				if ((this._CheckManName != value))
+				{
+					this._CheckManName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypesName", DbType="NVarChar(200)")]
+		public string RegisterTypesName
+		{
+			get
+			{
+				return this._RegisterTypesName;
+			}
+			set
+			{
+				if ((this._RegisterTypesName != value))
+				{
+					this._RegisterTypesName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(30) NOT NULL", CanBeNull=false)]
+		public string WorkAreaName
+		{
+			get
+			{
+				return this._WorkAreaName;
+			}
+			set
+			{
+				if ((this._WorkAreaName != value))
+				{
+					this._WorkAreaName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityUnitName", DbType="NVarChar(200)")]
+		public string ResponsibilityUnitName
+		{
+			get
+			{
+				return this._ResponsibilityUnitName;
+			}
+			set
+			{
+				if ((this._ResponsibilityUnitName != value))
+				{
+					this._ResponsibilityUnitName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RectificationTime
+		{
+			get
+			{
+				return this._RectificationTime;
+			}
+			set
+			{
+				if ((this._RectificationTime != value))
+				{
+					this._RectificationTime = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="states", Storage="_States", DbType="Char(1)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this._States = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDef", DbType="NVarChar(500)")]
+		public string RegisterDef
+		{
+			get
+			{
+				return this._RegisterDef;
+			}
+			set
+			{
+				if ((this._RegisterDef != value))
+				{
+					this._RegisterDef = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardValue", DbType="NVarChar(50)")]
+		public string HazardValue
+		{
+			get
+			{
+				return this._HazardValue;
+			}
+			set
+			{
+				if ((this._HazardValue != value))
+				{
+					this._HazardValue = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes2Id", DbType="NVarChar(50)")]
+		public string RegisterTypes2Id
+		{
+			get
+			{
+				return this._RegisterTypes2Id;
+			}
+			set
+			{
+				if ((this._RegisterTypes2Id != value))
+				{
+					this._RegisterTypes2Id = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes2Name", DbType="NVarChar(200)")]
+		public string RegisterTypes2Name
+		{
+			get
+			{
+				return this._RegisterTypes2Name;
+			}
+			set
+			{
+				if ((this._RegisterTypes2Name != value))
+				{
+					this._RegisterTypes2Name = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes3Id", DbType="NVarChar(50)")]
+		public string RegisterTypes3Id
+		{
+			get
+			{
+				return this._RegisterTypes3Id;
+			}
+			set
+			{
+				if ((this._RegisterTypes3Id != value))
+				{
+					this._RegisterTypes3Id = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes3Name", DbType="NVarChar(200)")]
+		public string RegisterTypes3Name
+		{
+			get
+			{
+				return this._RegisterTypes3Name;
+			}
+			set
+			{
+				if ((this._RegisterTypes3Name != value))
+				{
+					this._RegisterTypes3Name = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes4Id", DbType="NVarChar(50)")]
+		public string RegisterTypes4Id
+		{
+			get
+			{
+				return this._RegisterTypes4Id;
+			}
+			set
+			{
+				if ((this._RegisterTypes4Id != value))
+				{
+					this._RegisterTypes4Id = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes4Name", DbType="NVarChar(200)")]
+		public string RegisterTypes4Name
+		{
+			get
+			{
+				return this._RegisterTypes4Name;
+			}
+			set
+			{
+				if ((this._RegisterTypes4Name != value))
+				{
+					this._RegisterTypes4Name = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityManName", DbType="NVarChar(200)")]
+		public string ResponsibilityManName
+		{
+			get
+			{
+				return this._ResponsibilityManName;
+			}
+			set
+			{
+				if ((this._ResponsibilityManName != value))
+				{
+					this._ResponsibilityManName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnitId", DbType="NVarChar(50)")]
+		public string SendUnitId
+		{
+			get
+			{
+				return this._SendUnitId;
+			}
+			set
+			{
+				if ((this._SendUnitId != value))
+				{
+					this._SendUnitId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
+		public string Rectification
+		{
+			get
+			{
+				return this._Rectification;
+			}
+			set
+			{
+				if ((this._Rectification != value))
+				{
+					this._Rectification = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationPeriod", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RectificationPeriod
+		{
+			get
+			{
+				return this._RectificationPeriod;
+			}
+			set
+			{
+				if ((this._RectificationPeriod != value))
+				{
+					this._RectificationPeriod = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RegisterDate
+		{
+			get
+			{
+				return this._RegisterDate;
+			}
+			set
+			{
+				if ((this._RegisterDate != value))
+				{
+					this._RegisterDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StatesStr", DbType="VarChar(6) NOT NULL", CanBeNull=false)]
+		public string StatesStr
+		{
+			get
+			{
+				return this._StatesStr;
+			}
+			set
+			{
+				if ((this._StatesStr != value))
+				{
+					this._StatesStr = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_Batch_PointBatch")]
 	public partial class View_HJGL_Batch_PointBatch
 	{