lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230724

This commit is contained in:
杨红卫 2023-07-24 14:49:45 +08:00
parent cfb16a4268
commit 3c141d8710
10 changed files with 161 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataBase/版本日志/SGGLDB_V2023-07-23.sql Normal file
View File

@ -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

2
SGGL/BLL/BaseInfo/CertificateService.cs
View File

@ -34,6 +34,7 @@ namespace BLL
CertificateName = certificate.CertificateName, CertificateName = certificate.CertificateName,
CertificateType = certificate.CertificateType, CertificateType = certificate.CertificateType,
IsRegisterHSSE = certificate.IsRegisterHSSE, IsRegisterHSSE = certificate.IsRegisterHSSE,
Type= certificate.Type,
Remark = certificate.Remark Remark = certificate.Remark
}; };
db.Base_Certificate.InsertOnSubmit(newCertificate); db.Base_Certificate.InsertOnSubmit(newCertificate);
@ -54,6 +55,7 @@ namespace BLL
newCertificate.CertificateName = certificate.CertificateName; newCertificate.CertificateName = certificate.CertificateName;
newCertificate.CertificateType = certificate.CertificateType; newCertificate.CertificateType = certificate.CertificateType;
newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE; newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE;
newCertificate.Type = certificate.Type;
newCertificate.Remark = certificate.Remark; newCertificate.Remark = certificate.Remark;
db.SubmitChanges(); db.SubmitChanges();
} }

23
SGGL/BLL/DropListService.cs
View File

@ -34,6 +34,10 @@
{ {
dropName.DataSource = HSSE_getContractType(); dropName.DataSource = HSSE_getContractType();
} }
else if (groupId == Group_CertificateType)
{
dropName.DataSource = HSSE_getCertificateType();
}
dropName.DataBind(); dropName.DataBind();
if (isShowPlease) if (isShowPlease)
{ {
@ -102,6 +106,11 @@
/// 合同类型 组id /// 合同类型 组id
/// </summary> /// </summary>
public const string Group_ContractType = "ContractType"; public const string Group_ContractType = "ContractType";
/// <summary>
/// 证书类型 组id
/// </summary>
public const string Group_CertificateType = "CertificateType";
#endregion #endregion
#region 公共平台 #region 公共平台
@ -348,6 +357,20 @@
list[2] = new ListItem("以完成一定工作量", "3"); list[2] = new ListItem("以完成一定工作量", "3");
return list; 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
#endregion #endregion

7
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -59,10 +59,9 @@ namespace BLL
} }
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null) if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
{ {
getDataList = from x in getDataList var idLists=(from x in db.SitePerson_PersonItem where x.ProjectId == projetcId && !x.OutTime.HasValue
join y in db.SitePerson_PersonItem on x.PersonId equals y.PersonId select x.PersonId).Distinct().ToList();
where y.ProjectId == projetcId && !y.OutTime.HasValue getDataList = getDataList.Where(x => idLists.Contains(x.PersonId));
select x;
} }
if (!string.IsNullOrEmpty(personType) && personType != Const._Null) if (!string.IsNullOrEmpty(personType) && personType != Const._Null)

37
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
View File

@ -21,20 +21,20 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" 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"> <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false" ColumnWidth="70% 30%">
<Items> <Items >
<f:Grid ID="Grid1" Title="特岗证书" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true" <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" DataKeyNames="CertificateId" DataIDField="CertificateId" OnPageIndexChange="Grid1_PageIndexChange"
AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True"> AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
<Columns> <Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" /> TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="CertificateCode" DataField="CertificateCode" <f:RenderField Width="80px" ColumnID="CertificateCode" DataField="CertificateCode"
FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Center"> FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="250px" ColumnID="CertificateName" DataField="CertificateName" <f:RenderField Width="200px" ColumnID="CertificateName" DataField="CertificateName"
FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="CertificateType" DataField="CertificateType" FieldType="String" <f:RenderField Width="100px" ColumnID="CertificateType" DataField="CertificateType" FieldType="String"
HeaderText="证件类别" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="证件类别" HeaderTextAlign="Center" TextAlign="Center">
@ -43,8 +43,13 @@
RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center" RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center"
TextAlign="Center"> TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="250px" ColumnID="Remark" DataField="Remark" FieldType="String" <f:TemplateField Width="120px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
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> </f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
@ -62,7 +67,7 @@
</PageItems> </PageItems>
</f:Grid> </f:Grid>
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false" <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="80px" BodyPadding="5px" Width="350px"> LabelWidth="110px" BodyPadding="5px" Width="450px" >
<Items> <Items>
<f:TextBox ID="hfFormID" Hidden="true" <f:TextBox ID="hfFormID" Hidden="true"
runat="server" LabelAlign="right"> runat="server" LabelAlign="right">
@ -73,14 +78,15 @@
<f:TextBox ID="txtCertificateName" Label="名称" ShowRedStar="true" Required="true" <f:TextBox ID="txtCertificateName" Label="名称" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"> runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpCertificateType" runat="server" Label="证件类别" LabelAlign="Right" <f:DropDownList ID="drpCertificateType" runat="server" Label="类别(ABC)" LabelAlign="Right">
LabelWidth="80px">
<f:ListItem Value="A" Text="A类" /> <f:ListItem Value="A" Text="A类" />
<f:ListItem Value="B" Text="B类" /> <f:ListItem Value="B" Text="B类" />
<f:ListItem Value="C" Text="C类" /> <f:ListItem Value="C" Text="C类" />
</f:DropDownList> </f:DropDownList>
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" LabelWidth="80px"> <f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" >
</f:CheckBox> </f:CheckBox>
<f:DropDownList ID="drpType" runat="server" Label="类型" LabelAlign="Right">
</f:DropDownList>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right"> <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
</f:TextArea> </f:TextArea>
</Items> </Items>
@ -141,6 +147,8 @@
var txtNameClientID = '<%= txtCertificateName.ClientID %>'; var txtNameClientID = '<%= txtCertificateName.ClientID %>';
var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>'; var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>';
var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>'; var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>';
var drpTypeClientID = '<%= drpType.ClientID %>';
var txtRemarkClientID = '<%=txtRemark.ClientID %>'; var txtRemarkClientID = '<%=txtRemark.ClientID %>';
function onGridRowSelect(event, rowId) { function onGridRowSelect(event, rowId) {
@ -158,6 +166,7 @@
F(txtNameClientID).setValue(rowValue['CertificateName']); F(txtNameClientID).setValue(rowValue['CertificateName']);
F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']); F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']);
F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']); F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']);
F(drpTypeClientID).setValue(rowValue['Type']);
F(txtRemarkClientID).setValue(rowValue['Remark']); F(txtRemarkClientID).setValue(rowValue['Remark']);
// 更新保存按钮文本 // 更新保存按钮文本

32
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
View File

@ -24,6 +24,7 @@ namespace FineUIPro.Web.BaseInfo
this.GetButtonPower(); this.GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize); Funs.DropDownPageSize(this.ddlPageSize);
Funs.FineUIPleaseSelect(this.drpCertificateType); Funs.FineUIPleaseSelect(this.drpCertificateType);
BLL.DropListService.InitConstDropDownList(this.drpType, DropListService.Group_CertificateType, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格 // 绑定表格
BindGrid(); BindGrid();
@ -190,6 +191,10 @@ namespace FineUIPro.Web.BaseInfo
{ {
this.ckbIsRegisterHSSE.Checked = true; this.ckbIsRegisterHSSE.Checked = true;
} }
if (!string.IsNullOrEmpty(certificate.Type))
{
this.drpType.SelectedValue = certificate.Type;
}
this.txtRemark.Text = certificate.Remark; this.txtRemark.Text = certificate.Remark;
hfFormID.Text = Id; hfFormID.Text = Id;
this.btnDelete.Enabled = true; this.btnDelete.Enabled = true;
@ -219,9 +224,13 @@ namespace FineUIPro.Web.BaseInfo
{ {
certificate.CertificateType = this.drpCertificateType.SelectedValue; certificate.CertificateType = this.drpCertificateType.SelectedValue;
} }
if (this.drpType.SelectedValue != BLL.Const._Null)
{
certificate.Type = this.drpType.SelectedValue;
}
if (string.IsNullOrEmpty(strRowID)) if (string.IsNullOrEmpty(strRowID))
{ {
certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate)); certificate.CertificateId = SQLHelper.GetNewID();
BLL.CertificateService.AddCertificate(certificate); BLL.CertificateService.AddCertificate(certificate);
BLL.LogService.AddSys_Log(this.CurrUser, certificate.CertificateCode, certificate.CertificateId, BLL.Const.CertificateMenuId, BLL.Const.BtnAdd); 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 #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
} }
} }

72
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo { namespace FineUIPro.Web.BaseInfo
{
public partial class Certificate {
public partial class Certificate
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
/// </summary> /// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// PageManager1 控件。 /// PageManager1 控件。
/// </summary> /// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.PageManager PageManager1; protected global::FineUIPro.PageManager PageManager1;
/// <summary> /// <summary>
/// Panel1 控件。 /// Panel1 控件。
/// </summary> /// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel Panel1; protected global::FineUIPro.Panel Panel1;
/// <summary> /// <summary>
/// Grid1 控件。 /// Grid1 控件。
/// </summary> /// </summary>
@ -47,7 +49,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Grid Grid1; protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary> /// <summary>
/// ToolbarSeparator1 控件。 /// ToolbarSeparator1 控件。
/// </summary> /// </summary>
@ -56,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary> /// <summary>
/// ToolbarText1 控件。 /// ToolbarText1 控件。
/// </summary> /// </summary>
@ -65,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1; protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary> /// <summary>
/// ddlPageSize 控件。 /// ddlPageSize 控件。
/// </summary> /// </summary>
@ -74,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize; protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary> /// <summary>
/// SimpleForm1 控件。 /// SimpleForm1 控件。
/// </summary> /// </summary>
@ -83,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm1; protected global::FineUIPro.SimpleForm SimpleForm1;
/// <summary> /// <summary>
/// hfFormID 控件。 /// hfFormID 控件。
/// </summary> /// </summary>
@ -92,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox hfFormID; protected global::FineUIPro.TextBox hfFormID;
/// <summary> /// <summary>
/// txtCertificateCode 控件。 /// txtCertificateCode 控件。
/// </summary> /// </summary>
@ -101,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCertificateCode; protected global::FineUIPro.TextBox txtCertificateCode;
/// <summary> /// <summary>
/// txtCertificateName 控件。 /// txtCertificateName 控件。
/// </summary> /// </summary>
@ -110,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCertificateName; protected global::FineUIPro.TextBox txtCertificateName;
/// <summary> /// <summary>
/// drpCertificateType 控件。 /// drpCertificateType 控件。
/// </summary> /// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpCertificateType; protected global::FineUIPro.DropDownList drpCertificateType;
/// <summary> /// <summary>
/// ckbIsRegisterHSSE 控件。 /// ckbIsRegisterHSSE 控件。
/// </summary> /// </summary>
@ -128,7 +139,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.CheckBox ckbIsRegisterHSSE; protected global::FineUIPro.CheckBox ckbIsRegisterHSSE;
/// <summary>
/// drpType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpType;
/// <summary> /// <summary>
/// txtRemark 控件。 /// txtRemark 控件。
/// </summary> /// </summary>
@ -137,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextArea txtRemark; protected global::FineUIPro.TextArea txtRemark;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>
@ -146,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary> /// <summary>
/// btnNew 控件。 /// btnNew 控件。
/// </summary> /// </summary>
@ -155,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnNew; protected global::FineUIPro.Button btnNew;
/// <summary> /// <summary>
/// btnDelete 控件。 /// btnDelete 控件。
/// </summary> /// </summary>
@ -164,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnDelete; protected global::FineUIPro.Button btnDelete;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。
/// </summary> /// </summary>
@ -173,7 +193,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1; protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary> /// <summary>
/// btnSave 控件。 /// btnSave 控件。
/// </summary> /// </summary>
@ -182,7 +202,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnSave; protected global::FineUIPro.Button btnSave;
/// <summary> /// <summary>
/// Menu1 控件。 /// Menu1 控件。
/// </summary> /// </summary>
@ -191,7 +211,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Menu Menu1; protected global::FineUIPro.Menu Menu1;
/// <summary> /// <summary>
/// btnMenuEdit 控件。 /// btnMenuEdit 控件。
/// </summary> /// </summary>
@ -200,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit; protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary> /// <summary>
/// btnMenuDelete 控件。 /// btnMenuDelete 控件。
/// </summary> /// </summary>

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -13946,7 +13946,7 @@
<AutoAssignPort>True</AutoAssignPort> <AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort> <DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6562/</IISUrl> <IISUrl>http://localhost:12528/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer> <UseCustomServer>False</UseCustomServer>
<CustomServerUrl> <CustomServerUrl>

7
SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
View File

@ -916,11 +916,8 @@ namespace FineUIPro.Web.Person
left join Base_Project P on C.ProjectId=P.ProjectId left join Base_Project P on C.ProjectId=P.ProjectId
where 1=1 "; where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>(); 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(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

97
SGGL/Model/Model.cs
View File

@ -10804,8 +10804,6 @@ namespace Model
private EntityRef<Person_Persons> _Person_Persons; private EntityRef<Person_Persons> _Person_Persons;
private EntitySet<ActionPlan_ActionPlanListApprove> _ActionPlan_ActionPlanListApprove;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -10844,7 +10842,6 @@ namespace Model
{ {
this._Base_Project = default(EntityRef<Base_Project>); this._Base_Project = default(EntityRef<Base_Project>);
this._Person_Persons = default(EntityRef<Person_Persons>); 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(); 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 PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@ -11236,18 +11220,6 @@ namespace Model
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); 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")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")]
@ -11280,8 +11252,6 @@ namespace Model
private System.Nullable<int> _IsPushOa; private System.Nullable<int> _IsPushOa;
private EntityRef<ActionPlan_ActionPlanList> _ActionPlan_ActionPlanList;
private EntityRef<Person_Persons> _Person_Persons; private EntityRef<Person_Persons> _Person_Persons;
#region 可扩展性方法定义 #region 可扩展性方法定义
@ -11316,7 +11286,6 @@ namespace Model
public ActionPlan_ActionPlanListApprove() public ActionPlan_ActionPlanListApprove()
{ {
this._ActionPlan_ActionPlanList = default(EntityRef<ActionPlan_ActionPlanList>);
this._Person_Persons = default(EntityRef<Person_Persons>); this._Person_Persons = default(EntityRef<Person_Persons>);
OnCreated(); OnCreated();
} }
@ -11352,10 +11321,6 @@ namespace Model
{ {
if ((this._ActionPlanListId != value)) if ((this._ActionPlanListId != value))
{ {
if (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnActionPlanListIdChanging(value); this.OnActionPlanListIdChanging(value);
this.SendPropertyChanging(); this.SendPropertyChanging();
this._ActionPlanListId = value; 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 public string ApproveIdea
{ {
get 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)] [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 public Person_Persons Person_Persons
{ {
@ -15770,6 +15701,8 @@ namespace Model
private System.Nullable<bool> _IsRegisterHSSE; private System.Nullable<bool> _IsRegisterHSSE;
private string _Type;
private EntitySet<QualityAudit_EquipmentPersonQuality> _QualityAudit_EquipmentPersonQuality; private EntitySet<QualityAudit_EquipmentPersonQuality> _QualityAudit_EquipmentPersonQuality;
private EntitySet<QualityAudit_PersonQuality> _QualityAudit_PersonQuality; private EntitySet<QualityAudit_PersonQuality> _QualityAudit_PersonQuality;
@ -15790,6 +15723,8 @@ namespace Model
partial void OnCertificateTypeChanged(); partial void OnCertificateTypeChanged();
partial void OnIsRegisterHSSEChanging(System.Nullable<bool> value); partial void OnIsRegisterHSSEChanging(System.Nullable<bool> value);
partial void OnIsRegisterHSSEChanged(); partial void OnIsRegisterHSSEChanged();
partial void OnTypeChanging(string value);
partial void OnTypeChanged();
#endregion #endregion
public Base_Certificate() 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")] [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 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 public string AttentPerson
{ {
get get