lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员档案补充筛选条件

Browse Source
This commit is contained in:
夏菊
2025-06-09 14:37:48 +08:00
parent 3e032aff19
commit c30a2c9503
9 changed files with 205 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/SitePerson/PersonService.cs
+9 -1
View File
@@ -122,7 +122,7 @@ namespace BLL
/// <param name="PageSize">每页数量</param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, bool chManager, Grid Grid1,bool isBlack=false)
bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, bool chManager, bool isHsse, bool isCQMS, Grid Grid1,bool isBlack=false)
{
IQueryable<Model.View_SitePerson_Person> getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
if (!string.IsNullOrEmpty(unitId))
@@ -184,6 +184,14 @@ namespace BLL
{
getPersonList = getPersonList.Where(x => x.PostType == Const.PostType_1);
}
if (isHsse == true)
{
getPersonList = getPersonList.Where(x => x.IsHsse == true);
}
if (isCQMS == true)
{
getPersonList = getPersonList.Where(x => x.IsCQMS == true);
}
if (ckIdCardInfoNotOK)
{
getPersonList = getPersonList.Where(x => x.IdentityCard == null || x.HeadImage == null || (x.IdentityCard.Length != 15 && x.IdentityCard.Length != 18));
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx
+8 -2
View File
@@ -32,6 +32,12 @@
Width="200px" LabelWidth="70px"
LabelAlign="right">
</f:TextBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
@@ -51,10 +57,10 @@
<f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
<f:CheckBox runat="server" ID="chIsHsse" Label="安管人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
<f:CheckBox runat="server" ID="chIsCQMS" Label="质量管理" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
+1 -1
View File
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
"", Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
false, this.chManager.Checked, Grid1, true);
false, this.chManager.Checked, this.chIsHsse.Checked, this.chIsCQMS.Checked, Grid1, true);
Grid1.RecordCount = PersonService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.designer.cs
Generated
+22 -4
View File
@@ -86,6 +86,24 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// ckJT 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
/// <summary>
/// ckTrain 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
/// <summary>
/// btSearch 控件。
/// </summary>
@@ -123,22 +141,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
protected global::FineUIPro.CheckBox chManager;
/// <summary>
/// ckJT 控件。
/// chIsHsse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
protected global::FineUIPro.CheckBox chIsHsse;
/// <summary>
/// ckTrain 控件。
/// chIsCQMS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
protected global::FineUIPro.CheckBox chIsCQMS;
/// <summary>
/// ToolbarFill1 控件。
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+11 -5
View File
@@ -65,6 +65,15 @@
Width="200px" LabelWidth="70px"
LabelAlign="right">
</f:TextBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckIdCardInfoNotOK" Label="信息不全" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
@@ -85,13 +94,10 @@
<f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
<f:CheckBox runat="server" ID="chIsHsse" Label="安管人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckIdCardInfoNotOK" Label="信息不全" LabelAlign="right" LabelWidth="80px"
<f:CheckBox runat="server" ID="chIsCQMS" Label="质量管理" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+1 -1
View File
@@ -182,7 +182,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
this.drpTreamGroup.SelectedValue, Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
this.ckIdCardInfoNotOK.Checked, this.chManager.Checked, Grid1);
this.ckIdCardInfoNotOK.Checked, this.chManager.Checked, this.chIsHsse.Checked, this.chIsCQMS.Checked, Grid1);
Grid1.RecordCount = PersonService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
Generated
+31 -13
View File
@@ -140,6 +140,33 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// ckJT 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
/// <summary>
/// ckTrain 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
/// <summary>
/// ckIdCardInfoNotOK 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
/// <summary>
/// btSearch 控件。
/// </summary>
@@ -186,31 +213,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
protected global::FineUIPro.CheckBox chManager;
/// <summary>
/// ckJT 控件。
/// chIsHsse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
protected global::FineUIPro.CheckBox chIsHsse;
/// <summary>
/// ckTrain 控件。
/// chIsCQMS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
/// <summary>
/// ckIdCardInfoNotOK 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
protected global::FineUIPro.CheckBox chIsCQMS;
/// <summary>
/// ToolbarFill1 控件。
SGGL/Model/Model.cs
+18
View File
@@ -449643,6 +449643,8 @@ namespace Model
private System.Nullable<bool> _IsHsse;
private System.Nullable<bool> _IsCQMS;
private System.Nullable<int> _TrainCount;
private string _AuditorId;
@@ -450325,6 +450327,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCQMS", DbType="Bit")]
public System.Nullable<bool> IsCQMS
{
get
{
return this._IsCQMS;
}
set
{
if ((this._IsCQMS != value))
{
this._IsCQMS = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainCount", DbType="Int")]
public System.Nullable<int> TrainCount
{