zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并穿透

This commit is contained in:
李超 2023-06-07 10:21:16 +08:00
parent 5e48a4ad91
commit 857a427be6
26 changed files with 231 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataBase/版本日志/SGGLDB_CD_V2023-06-06-001.sql Normal file
View File

@ -0,0 +1,6 @@
alter table Base_Project add isDelete bit null
ALTER TABLE [dbo].[Base_Project] ADD [ProjectAttribute] [varchar](50) NULL
Alter TABLE [dbo].[Accident_AccidentPersonRecord] Add
[IsAttempt] [char](1) NULL

11
SGGL/BLL/Common/CommonService.cs
View File

@ -725,5 +725,16 @@ namespace BLL
{
return Funs.DB.Base_Unit.FirstOrDefault(x=>x.UnitId==Const.UnitId_CD);
}
/// <summary>
/// 得到本单位Id
/// </summary>
/// <returns></returns>
public static string GetThisUnitId()
{
string unitId = Const.UnitId_CD;
return unitId;
}
}
}

7
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
View File

@ -53,12 +53,7 @@ namespace FineUIPro.Web.DataShow
if (rbType.SelectedValue == "0")
{
strSql += " AND AccidentType.AccidentTypeName LIKE @values";
listStr.Add(new SqlParameter("@values", "% 未遂%"));
}
else
{
strSql += " AND '未遂' NOT IN (AccidentType.AccidentTypeName)";
strSql += " AND Record.IsAttempt='1'";
}
}
else

6
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
View File

@ -1,8 +1,12 @@
using BLL;
using Aspose.Words;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{

5
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
View File

@ -37,16 +37,17 @@ namespace FineUIPro.Web.DataShow
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string UnitId = CommonService.GetThisUnitId();
if (this.rbCom.SelectedValue == "0")
{
strSql += " AND Person.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", UnitId));
}
else
{
strSql += " AND Person.UnitId != @UnitId";
listStr.Add(new SqlParameter("@UnitId", UnitId));
}
listStr.Add(new SqlParameter("@UnitId", Const.UnitId_CD));
if (rbType.SelectedValue == "0")
{
strSql += " AND Person.WorkPostId = @WorkPostId";

2
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
string strSql = @"SELECT NEWID() AS ID,Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
FROM CH_CheckItem AS Item
LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId

2
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
View File

@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

24
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
View File

@ -1,10 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@ -153,12 +156,18 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImageUrlByImage(object registrationId)
{
string url = string.Empty;
string httpUrl = string.Empty;
var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
if (sysSet6 != null)
{
httpUrl = sysSet6.SetValue;
}
if (registrationId != null)
{
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.ImageUrl);
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
}
}
return url;
@ -173,16 +182,21 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImgUrlByImage(object registrationId)
{
string url = string.Empty;
string httpUrl = string.Empty;
var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
if (sysSet6 != null)
{
httpUrl = sysSet6.SetValue;
}
if (registrationId != null)
{
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.RectificationImageUrl);
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
}
}
return url;
}
}
}

2
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
View File

@ -43,7 +43,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

7
SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
View File

@ -1,8 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{

4
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
View File

@ -32,12 +32,12 @@ namespace FineUIPro.Web.DataShow
private void BindGrid()
{
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState,(case ProjectAttribute when 'GONGCHENG' then '工程' when 'SHIYE' then '实业' else '' end) as ProjectAttributeName"
+ @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2"
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+ @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
+ @" WHERE 1=1";
+ @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) and (Project.isDelete IS NULL OR Project.isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.ckState.SelectedValue != "0")

2
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

4
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
View File

@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM Person_CompanyBranchPerson AS Person "
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
string UnitId = CommonService.GetThisUnitId();
if (this.rbCom.SelectedValue == "1")
{
strSql += " AND Person.UnitId = @UnitId";
@ -51,7 +51,7 @@ namespace FineUIPro.Web.DataShow
{
strSql += " AND Person.UnitId != @UnitId";
}
listStr.Add(new SqlParameter("@UnitId", Const.UnitId_CD));
listStr.Add(new SqlParameter("@UnitId", UnitId));
this.Grid1.Columns[1].Hidden = true;
}
else

2
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
View File

@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

6
SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
View File

@ -1,9 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{

2
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

2
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

9
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
View File

@ -1,8 +1,15 @@
using BLL;
using Aspose.Words;
using BLL;
using FineUIPro.Web.BaseInfo;
using Model;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{

2
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)

42
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1529,3 +1529,45 @@ IP地址:::1
出错时间:05/25/2023 16:49:49
错误信息开始=====>
错误类型:HttpException
错误信息:文件“/DataShow/Unit.aspx”不存在。
错误堆栈:
在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
出错时间:06/06/2023 10:02:51
出错文件:http://localhost:1295/DataShow/Unit.aspx
IP地址:::1
出错时间:06/06/2023 10:02:51
错误信息开始=====>
错误类型:HttpException
错误信息:文件“/DataShow/Unit.aspx”不存在。
错误堆栈:
在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
出错时间:06/06/2023 10:02:54
出错文件:http://localhost:1295/DataShow/Unit.aspx
IP地址:::1
出错时间:06/06/2023 10:02:54

1
SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx.cs
View File

@ -627,6 +627,7 @@ namespace FineUIPro.Web.HSSE.Hazard
JObject values = mergedRow.Value<JObject>("values");
Model.Hazard_HazardSelectedItem hazardSelectedItem = new Model.Hazard_HazardSelectedItem
{
HazardSelectedItemId = Guid.NewGuid().ToString(),
HazardId = values.Value<string>("HazardId"),
HazardListTypeId = values.Value<string>("HazardListTypeId"),
WorkStage = values.Value<string>("WorkStage"),

100
SGGL/Model/Model.cs
View File

@ -10423,6 +10423,8 @@ namespace Model
private string _States;
private string _IsAttempt;
private EntityRef<Base_AccidentType> _Base_AccidentType;
private EntityRef<Base_Project> _Base_Project;
@ -10469,6 +10471,8 @@ namespace Model
partial void OnCompileDateChanged();
partial void OnStatesChanging(string value);
partial void OnStatesChanged();
partial void OnIsAttemptChanging(string value);
partial void OnIsAttemptChanged();
#endregion
public Accident_AccidentPersonRecord()
@ -10821,6 +10825,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAttempt", DbType="Char(1)")]
public string IsAttempt
{
get
{
return this._IsAttempt;
}
set
{
if ((this._IsAttempt != value))
{
this.OnIsAttemptChanging(value);
this.SendPropertyChanging();
this._IsAttempt = value;
this.SendPropertyChanged("IsAttempt");
this.OnIsAttemptChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_Base_AccidentType", Storage="_Base_AccidentType", ThisKey="AccidentTypeId", OtherKey="AccidentTypeId", IsForeignKey=true)]
public Base_AccidentType Base_AccidentType
{
@ -24695,6 +24719,10 @@ namespace Model
private string _ProjectNum;
private System.Nullable<bool> _IsDelete;
private string _ProjectAttribute;
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@ -25339,6 +25367,10 @@ namespace Model
partial void OnMonitorIdChanged();
partial void OnProjectNumChanging(string value);
partial void OnProjectNumChanged();
partial void OnIsDeleteChanging(System.Nullable<bool> value);
partial void OnIsDeleteChanged();
partial void OnProjectAttributeChanging(string value);
partial void OnProjectAttributeChanged();
#endregion
public Base_Project()
@ -26320,6 +26352,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isDelete", Storage="_IsDelete", DbType="Bit")]
public System.Nullable<bool> IsDelete
{
get
{
return this._IsDelete;
}
set
{
if ((this._IsDelete != value))
{
this.OnIsDeleteChanging(value);
this.SendPropertyChanging();
this._IsDelete = value;
this.SendPropertyChanged("IsDelete");
this.OnIsDeleteChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectAttribute", DbType="VarChar(50)")]
public string ProjectAttribute
{
get
{
return this._ProjectAttribute;
}
set
{
if ((this._ProjectAttribute != value))
{
this.OnProjectAttributeChanging(value);
this.SendPropertyChanging();
this._ProjectAttribute = value;
this.SendPropertyChanged("ProjectAttribute");
this.OnProjectAttributeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
{
@ -148695,6 +148767,8 @@ namespace Model
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _HazardSelectedItemId;
private string _HazardId;
private string _HazardListTypeId;
@ -148739,6 +148813,8 @@ namespace Model
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnHazardSelectedItemIdChanging(string value);
partial void OnHazardSelectedItemIdChanged();
partial void OnHazardIdChanging(string value);
partial void OnHazardIdChanged();
partial void OnHazardListTypeIdChanging(string value);
@ -148786,7 +148862,27 @@ namespace Model
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardSelectedItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string HazardSelectedItemId
{
get
{
return this._HazardSelectedItemId;
}
set
{
if ((this._HazardSelectedItemId != value))
{
this.OnHazardSelectedItemIdChanging(value);
this.SendPropertyChanging();
this._HazardSelectedItemId = value;
this.SendPropertyChanged("HazardSelectedItemId");
this.OnHazardSelectedItemIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardId", DbType="NVarChar(50)")]
public string HazardId
{
get
@ -148826,7 +148922,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardListId", DbType="NVarChar(50)")]
public string HazardListId
{
get