20230724
This commit is contained in:
parent
cfb16a4268
commit
3c141d8710
|
|
@ -0,0 +1,4 @@
|
|||
ALTER TABLE Base_Certificate ADD Type VARCHAR(10) NULL
|
||||
GO
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'类型(1特岗;2安管;3特种设备;-1其他)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Certificate', @level2type=N'COLUMN',@level2name=N'Type'
|
||||
GO
|
||||
|
|
@ -34,6 +34,7 @@ namespace BLL
|
|||
CertificateName = certificate.CertificateName,
|
||||
CertificateType = certificate.CertificateType,
|
||||
IsRegisterHSSE = certificate.IsRegisterHSSE,
|
||||
Type= certificate.Type,
|
||||
Remark = certificate.Remark
|
||||
};
|
||||
db.Base_Certificate.InsertOnSubmit(newCertificate);
|
||||
|
|
@ -54,6 +55,7 @@ namespace BLL
|
|||
newCertificate.CertificateName = certificate.CertificateName;
|
||||
newCertificate.CertificateType = certificate.CertificateType;
|
||||
newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE;
|
||||
newCertificate.Type = certificate.Type;
|
||||
newCertificate.Remark = certificate.Remark;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@
|
|||
{
|
||||
dropName.DataSource = HSSE_getContractType();
|
||||
}
|
||||
else if (groupId == Group_CertificateType)
|
||||
{
|
||||
dropName.DataSource = HSSE_getCertificateType();
|
||||
}
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
|
|
@ -102,6 +106,11 @@
|
|||
/// 合同类型 组id
|
||||
/// </summary>
|
||||
public const string Group_ContractType = "ContractType";
|
||||
|
||||
/// <summary>
|
||||
/// 证书类型 组id
|
||||
/// </summary>
|
||||
public const string Group_CertificateType = "CertificateType";
|
||||
#endregion
|
||||
|
||||
#region 公共平台
|
||||
|
|
@ -348,6 +357,20 @@
|
|||
list[2] = new ListItem("以完成一定工作量", "3");
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 证书类型
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static ListItem[] HSSE_getCertificateType()
|
||||
{
|
||||
ListItem[] list = new ListItem[4];
|
||||
list[0] = new ListItem("特岗", "1");
|
||||
list[1] = new ListItem("安管", "2");
|
||||
list[2] = new ListItem("特种设备", "3");
|
||||
list[3] = new ListItem("其他", "-1");
|
||||
return list;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -59,10 +59,9 @@ namespace BLL
|
|||
}
|
||||
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
|
||||
{
|
||||
getDataList = from x in getDataList
|
||||
join y in db.SitePerson_PersonItem on x.PersonId equals y.PersonId
|
||||
where y.ProjectId == projetcId && !y.OutTime.HasValue
|
||||
select x;
|
||||
var idLists=(from x in db.SitePerson_PersonItem where x.ProjectId == projetcId && !x.OutTime.HasValue
|
||||
select x.PersonId).Distinct().ToList();
|
||||
getDataList = getDataList.Where(x => idLists.Contains(x.PersonId));
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(personType) && personType != Const._Null)
|
||||
|
|
|
|||
|
|
@ -21,20 +21,20 @@
|
|||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
|
||||
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false">
|
||||
<Items>
|
||||
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false" ColumnWidth="70% 30%">
|
||||
<Items >
|
||||
<f:Grid ID="Grid1" Title="特岗证书" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true"
|
||||
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" ForceFit="true"
|
||||
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px"
|
||||
DataKeyNames="CertificateId" DataIDField="CertificateId" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
|
||||
TextAlign="Center" />
|
||||
<f:RenderField Width="150px" ColumnID="CertificateCode" DataField="CertificateCode"
|
||||
FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Center">
|
||||
<f:RenderField Width="80px" ColumnID="CertificateCode" DataField="CertificateCode"
|
||||
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="250px" ColumnID="CertificateName" DataField="CertificateName"
|
||||
FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left">
|
||||
<f:RenderField Width="200px" ColumnID="CertificateName" DataField="CertificateName"
|
||||
FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="CertificateType" DataField="CertificateType" FieldType="String"
|
||||
HeaderText="证件类别" HeaderTextAlign="Center" TextAlign="Center">
|
||||
|
|
@ -43,8 +43,13 @@
|
|||
RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center"
|
||||
TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="250px" ColumnID="Remark" DataField="Remark" FieldType="String"
|
||||
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
|
||||
<f:TemplateField Width="120px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label1" runat="server" Text='<%# ConvertType(Eval("Type")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" FieldType="String"
|
||||
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center" ExpandUnusedSpace="true">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
|
|
@ -62,7 +67,7 @@
|
|||
</PageItems>
|
||||
</f:Grid>
|
||||
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
|
||||
LabelWidth="80px" BodyPadding="5px" Width="350px">
|
||||
LabelWidth="110px" BodyPadding="5px" Width="450px" >
|
||||
<Items>
|
||||
<f:TextBox ID="hfFormID" Hidden="true"
|
||||
runat="server" LabelAlign="right">
|
||||
|
|
@ -73,14 +78,15 @@
|
|||
<f:TextBox ID="txtCertificateName" Label="名称" ShowRedStar="true" Required="true"
|
||||
runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
|
||||
</f:TextBox>
|
||||
<f:DropDownList ID="drpCertificateType" runat="server" Label="证件类别" LabelAlign="Right"
|
||||
LabelWidth="80px">
|
||||
<f:DropDownList ID="drpCertificateType" runat="server" Label="类别(ABC)" LabelAlign="Right">
|
||||
<f:ListItem Value="A" Text="A类" />
|
||||
<f:ListItem Value="B" Text="B类" />
|
||||
<f:ListItem Value="C" Text="C类" />
|
||||
</f:DropDownList>
|
||||
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" LabelWidth="80px">
|
||||
</f:DropDownList>
|
||||
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" >
|
||||
</f:CheckBox>
|
||||
<f:DropDownList ID="drpType" runat="server" Label="类型" LabelAlign="Right">
|
||||
</f:DropDownList>
|
||||
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
|
|
@ -141,6 +147,8 @@
|
|||
var txtNameClientID = '<%= txtCertificateName.ClientID %>';
|
||||
var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>';
|
||||
var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>';
|
||||
|
||||
var drpTypeClientID = '<%= drpType.ClientID %>';
|
||||
var txtRemarkClientID = '<%=txtRemark.ClientID %>';
|
||||
|
||||
function onGridRowSelect(event, rowId) {
|
||||
|
|
@ -158,6 +166,7 @@
|
|||
F(txtNameClientID).setValue(rowValue['CertificateName']);
|
||||
F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']);
|
||||
F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']);
|
||||
F(drpTypeClientID).setValue(rowValue['Type']);
|
||||
F(txtRemarkClientID).setValue(rowValue['Remark']);
|
||||
|
||||
// 更新保存按钮文本
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ namespace FineUIPro.Web.BaseInfo
|
|||
this.GetButtonPower();
|
||||
Funs.DropDownPageSize(this.ddlPageSize);
|
||||
Funs.FineUIPleaseSelect(this.drpCertificateType);
|
||||
BLL.DropListService.InitConstDropDownList(this.drpType, DropListService.Group_CertificateType, true);
|
||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
// 绑定表格
|
||||
BindGrid();
|
||||
|
|
@ -190,6 +191,10 @@ namespace FineUIPro.Web.BaseInfo
|
|||
{
|
||||
this.ckbIsRegisterHSSE.Checked = true;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(certificate.Type))
|
||||
{
|
||||
this.drpType.SelectedValue = certificate.Type;
|
||||
}
|
||||
this.txtRemark.Text = certificate.Remark;
|
||||
hfFormID.Text = Id;
|
||||
this.btnDelete.Enabled = true;
|
||||
|
|
@ -219,9 +224,13 @@ namespace FineUIPro.Web.BaseInfo
|
|||
{
|
||||
certificate.CertificateType = this.drpCertificateType.SelectedValue;
|
||||
}
|
||||
if (this.drpType.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
certificate.Type = this.drpType.SelectedValue;
|
||||
}
|
||||
if (string.IsNullOrEmpty(strRowID))
|
||||
{
|
||||
certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate));
|
||||
certificate.CertificateId = SQLHelper.GetNewID();
|
||||
BLL.CertificateService.AddCertificate(certificate);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, certificate.CertificateCode, certificate.CertificateId, BLL.Const.CertificateMenuId, BLL.Const.BtnAdd);
|
||||
}
|
||||
|
|
@ -302,5 +311,26 @@ namespace FineUIPro.Web.BaseInfo
|
|||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 根据身份证号码获取年龄
|
||||
/// <summary>
|
||||
/// 根据身份证号码获取年龄
|
||||
/// </summary>
|
||||
/// <param name="IdentityCard"></param>
|
||||
/// <returns></returns>
|
||||
protected string ConvertType(object Type)
|
||||
{
|
||||
string name = string.Empty;
|
||||
if (Type != null)
|
||||
{
|
||||
var doplist = DropListService.HSSE_getCertificateType().FirstOrDefault(x => x.Value == Type.ToString());
|
||||
if (doplist != null)
|
||||
{
|
||||
name = doplist.Text;
|
||||
}
|
||||
}
|
||||
return name;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
@ -7,11 +7,13 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.BaseInfo {
|
||||
|
||||
|
||||
public partial class Certificate {
|
||||
|
||||
namespace FineUIPro.Web.BaseInfo
|
||||
{
|
||||
|
||||
|
||||
public partial class Certificate
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -47,7 +49,16 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Label1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label1;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -56,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -65,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSize 控件。
|
||||
/// </summary>
|
||||
|
|
@ -74,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -83,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.SimpleForm SimpleForm1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// hfFormID 控件。
|
||||
/// </summary>
|
||||
|
|
@ -92,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox hfFormID;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -101,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCertificateCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateName 控件。
|
||||
/// </summary>
|
||||
|
|
@ -110,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCertificateName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpCertificateType 控件。
|
||||
/// </summary>
|
||||
|
|
@ -119,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCertificateType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckbIsRegisterHSSE 控件。
|
||||
/// </summary>
|
||||
|
|
@ -128,7 +139,16 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckbIsRegisterHSSE;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpType;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
|
|
@ -137,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtRemark;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -146,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -155,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -164,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnDelete;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -173,7 +193,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
|
|
@ -182,7 +202,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -191,7 +211,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -200,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -13946,7 +13946,7 @@
|
|||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>0</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:6562/</IISUrl>
|
||||
<IISUrl>http://localhost:12528/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
|
|
|||
|
|
@ -916,11 +916,8 @@ namespace FineUIPro.Web.Person
|
|||
left join Base_Project P on C.ProjectId=P.ProjectId
|
||||
where 1=1 ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId)
|
||||
{
|
||||
strSql += " AND C.UserId=@UserId ";
|
||||
listStr.Add(new SqlParameter("@UserId", this.PersonId));
|
||||
}
|
||||
strSql += " AND C.UserId=@UserId ";
|
||||
listStr.Add(new SqlParameter("@UserId", this.PersonId ?? ""));
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
|
|
|||
|
|
@ -10804,8 +10804,6 @@ namespace Model
|
|||
|
||||
private EntityRef<Person_Persons> _Person_Persons;
|
||||
|
||||
private EntitySet<ActionPlan_ActionPlanListApprove> _ActionPlan_ActionPlanListApprove;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
|
|
@ -10844,7 +10842,6 @@ namespace Model
|
|||
{
|
||||
this._Base_Project = default(EntityRef<Base_Project>);
|
||||
this._Person_Persons = default(EntityRef<Person_Persons>);
|
||||
this._ActionPlan_ActionPlanListApprove = new EntitySet<ActionPlan_ActionPlanListApprove>(new Action<ActionPlan_ActionPlanListApprove>(this.attach_ActionPlan_ActionPlanListApprove), new Action<ActionPlan_ActionPlanListApprove>(this.detach_ActionPlan_ActionPlanListApprove));
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
|
|
@ -11204,19 +11201,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanListApprove", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<ActionPlan_ActionPlanListApprove> ActionPlan_ActionPlanListApprove
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ActionPlan_ActionPlanListApprove;
|
||||
}
|
||||
set
|
||||
{
|
||||
this._ActionPlan_ActionPlanListApprove.Assign(value);
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
|
@ -11236,18 +11220,6 @@ namespace Model
|
|||
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
|
||||
private void attach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.ActionPlan_ActionPlanList = this;
|
||||
}
|
||||
|
||||
private void detach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.ActionPlan_ActionPlanList = null;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")]
|
||||
|
|
@ -11280,8 +11252,6 @@ namespace Model
|
|||
|
||||
private System.Nullable<int> _IsPushOa;
|
||||
|
||||
private EntityRef<ActionPlan_ActionPlanList> _ActionPlan_ActionPlanList;
|
||||
|
||||
private EntityRef<Person_Persons> _Person_Persons;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
|
@ -11316,7 +11286,6 @@ namespace Model
|
|||
|
||||
public ActionPlan_ActionPlanListApprove()
|
||||
{
|
||||
this._ActionPlan_ActionPlanList = default(EntityRef<ActionPlan_ActionPlanList>);
|
||||
this._Person_Persons = default(EntityRef<Person_Persons>);
|
||||
OnCreated();
|
||||
}
|
||||
|
|
@ -11352,10 +11321,6 @@ namespace Model
|
|||
{
|
||||
if ((this._ActionPlanListId != value))
|
||||
{
|
||||
if (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue)
|
||||
{
|
||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
||||
}
|
||||
this.OnActionPlanListIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._ActionPlanListId = value;
|
||||
|
|
@ -11429,7 +11394,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
|
||||
public string ApproveIdea
|
||||
{
|
||||
get
|
||||
|
|
@ -11569,40 +11534,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanList", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", IsForeignKey=true)]
|
||||
public ActionPlan_ActionPlanList ActionPlan_ActionPlanList
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ActionPlan_ActionPlanList.Entity;
|
||||
}
|
||||
set
|
||||
{
|
||||
ActionPlan_ActionPlanList previousValue = this._ActionPlan_ActionPlanList.Entity;
|
||||
if (((previousValue != value)
|
||||
|| (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue == false)))
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
if ((previousValue != null))
|
||||
{
|
||||
this._ActionPlan_ActionPlanList.Entity = null;
|
||||
previousValue.ActionPlan_ActionPlanListApprove.Remove(this);
|
||||
}
|
||||
this._ActionPlan_ActionPlanList.Entity = value;
|
||||
if ((value != null))
|
||||
{
|
||||
value.ActionPlan_ActionPlanListApprove.Add(this);
|
||||
this._ActionPlanListId = value.ActionPlanListId;
|
||||
}
|
||||
else
|
||||
{
|
||||
this._ActionPlanListId = default(string);
|
||||
}
|
||||
this.SendPropertyChanged("ActionPlan_ActionPlanList");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_Person_Persons", ThisKey="ApproveMan", OtherKey="PersonId", IsForeignKey=true)]
|
||||
public Person_Persons Person_Persons
|
||||
{
|
||||
|
|
@ -15770,6 +15701,8 @@ namespace Model
|
|||
|
||||
private System.Nullable<bool> _IsRegisterHSSE;
|
||||
|
||||
private string _Type;
|
||||
|
||||
private EntitySet<QualityAudit_EquipmentPersonQuality> _QualityAudit_EquipmentPersonQuality;
|
||||
|
||||
private EntitySet<QualityAudit_PersonQuality> _QualityAudit_PersonQuality;
|
||||
|
|
@ -15790,6 +15723,8 @@ namespace Model
|
|||
partial void OnCertificateTypeChanged();
|
||||
partial void OnIsRegisterHSSEChanging(System.Nullable<bool> value);
|
||||
partial void OnIsRegisterHSSEChanged();
|
||||
partial void OnTypeChanging(string value);
|
||||
partial void OnTypeChanged();
|
||||
#endregion
|
||||
|
||||
public Base_Certificate()
|
||||
|
|
@ -15919,6 +15854,26 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(10)")]
|
||||
public string Type
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Type;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Type != value))
|
||||
{
|
||||
this.OnTypeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Type = value;
|
||||
this.SendPropertyChanged("Type");
|
||||
this.OnTypeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_EquipmentPersonQuality_Base_Certificate", Storage="_QualityAudit_EquipmentPersonQuality", ThisKey="CertificateId", OtherKey="CertificateId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<QualityAudit_EquipmentPersonQuality> QualityAudit_EquipmentPersonQuality
|
||||
{
|
||||
|
|
@ -148750,7 +148705,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
|
||||
public string AttentPerson
|
||||
{
|
||||
get
|
||||
|
|
|
|||
Loading…
Reference in New Issue