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

项目当前现场人员界面补充查询条件

This commit is contained in:
夏菊 2025-12-08 10:02:06 +08:00
parent 2b1680c9bc
commit 3d4009617e
4 changed files with 101 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SGGL/BLL/ProjectData/TeamGroupService.cs
View File

@ -119,9 +119,23 @@ namespace BLL
/// <returns></returns>
public static object GetTeamGroupListByUnitId(string projectId, string unitId)
{
return (from x in Funs.DB.ProjectData_TeamGroup
where x.ProjectId == projectId && x.UnitId == unitId
orderby x.TeamGroupCode select x).ToList();
//return (from x in Funs.DB.ProjectData_TeamGroup
// where x.ProjectId == projectId && x.UnitId == unitId
// orderby x.TeamGroupCode select x).ToList();
var list = (from x in Funs.DB.ProjectData_TeamGroup
orderby x.TeamGroupCode
select x).ToList();
if (!string.IsNullOrWhiteSpace(projectId))
{
list = list.Where(x => x.ProjectId == projectId).ToList();
}
if (!string.IsNullOrWhiteSpace(unitId))
{
list = list.Where(x => x.UnitId == unitId).ToList();
}
return list;
}
public static Model.ProjectData_TeamGroup getTeamGroupByTeamGroupName(string projectId, string unitId, string name)

15
SGGL/FineUIPro.Web/DataShow/ProjectSitePerson.aspx
View File

@ -20,6 +20,21 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="人员名称" ID="txtPersonName" EmptyText="输入查询条件"
Width="220px" LabelWidth="80px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
<f:DropDownList runat="server" ID="drpUnit" Label="单位名称" EnableEdit="true" EnableCheckBoxSelect="false"
Width="360px" LabelWidth="80px" LabelAlign="Right" EnableMultiSelect="false"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList runat="server" ID="drpWorkTeam" Label="班组" EnableEdit="true" EnableCheckBoxSelect="false"
EnableMultiSelect="false" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
Width="350px" LabelAlign="Right" LabelWidth="70px">
</f:DropDownList>
<f:DropDownList runat="server" ID="drpWorkPost" Label="岗位" EnableEdit="true" EnableCheckBoxSelect="false"
EnableMultiSelect="false" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
Width="250px" LabelAlign="Right" LabelWidth="50px">
</f:DropDownList>
<f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>

28
SGGL/FineUIPro.Web/DataShow/ProjectSitePerson.aspx.cs
View File

@ -36,8 +36,11 @@ namespace FineUIPro.Web.DataShow
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
this.ProjectId = this.CurrUser.LoginProjectId;
Funs.DropDownPageSize(this.ddlPageSize);
UnitService.InitUnitDownList(this.drpUnit, this.ProjectId, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpWorkTeam, this.ProjectId, null, true);
WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true);
this.Panel1.Title = $"项目当前现场人员（{BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId)}）";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
//BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
@ -80,9 +83,12 @@ namespace FineUIPro.Web.DataShow
{
PersonId = record.PersonId,
PersonName = y.PersonName,
WorkPostId = y.WorkPostId,
WorkPostName = z.WorkPostName,
IdentityCard = y.IdentityCard,
UnitId = y.UnitId,
UnitName = u.UnitName,
TeamGroupId = y.TeamGroupId,
TeamGroupName = tg.TeamGroupName,
ProjectId = record.ProjectId,
ChangeTime = record.MaxChangeTime,
@ -94,6 +100,26 @@ namespace FineUIPro.Web.DataShow
{
finalQuery = finalQuery.Where(x => x.PostType == Const.PostType_1);
}
if (!string.IsNullOrWhiteSpace(this.txtPersonName.Text.Trim()))
{
finalQuery = finalQuery.Where(x => x.PersonName.Contains(this.txtPersonName.Text.Trim()));
}
if (this.drpUnit.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnit.SelectedValue))
{
finalQuery = finalQuery.Where(x => x.UnitId == this.drpUnit.SelectedValue);
}
if (this.drpWorkPost.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPost.SelectedValue))
{
finalQuery = finalQuery.Where(x => x.WorkPostId == this.drpWorkPost.SelectedValue);
}
if (this.drpWorkTeam.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkTeam.SelectedValue))
{
finalQuery = finalQuery.Where(x => x.TeamGroupId == this.drpWorkTeam.SelectedValue);
}
DataTable tb = this.LINQToDataTable(finalQuery);

36
SGGL/FineUIPro.Web/DataShow/ProjectSitePerson.aspx.designer.cs generated
View File

@ -59,6 +59,42 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtPersonName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpWorkTeam 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkTeam;
/// <summary>
/// drpWorkPost 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPost;
/// <summary>
/// chManager 控件。
/// </summary>