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

20220907特岗人员资质列表页面新增按是否在岗查询。

This commit is contained in:
杨红卫 2022-09-07 10:41:18 +08:00
parent fc4f47dbab
commit f5ab6ad44f
6 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt Normal file
View File

@ -0,0 +1,5 @@
--ADD BY YangHongwei 2022-09-06
1、项目劳务人员合同信息填报功能增加。
2、人员查看页面完善。
3、人员接口优化。
--END

3
DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt Normal file
View File

@ -0,0 +1,3 @@
--ADD BY YangHongwei 2022-09-07
1、特岗人员资质列表页面新增按是否在岗查询。
--END

8
SGGL/BLL/API/APIUserService.cs
View File

@ -138,7 +138,7 @@ namespace BLL
{
var getDatas = from x in db.Person_Persons
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
where y.ProjectId == projectId && y.States == Const.State_1 && x.RoleIds != null
where y.ProjectId == projectId && y.States == Const.State_1 && y.RoleIds != null
select new Model.UserItem
{
PersonId = x.PersonId,
@ -241,7 +241,7 @@ namespace BLL
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType && y.States == Const.State_1
&& (strParam == null || x.PersonName.Contains(strParam)) && x.RoleIds != null
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds != null
select new Model.UserItem
{
PersonId = x.PersonId,
@ -273,7 +273,7 @@ namespace BLL
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType && y.States == Const.State_1
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Contains(item) && x.RoleIds != null
&& (strParam == null || x.PersonName.Contains(strParam)) && y.RoleIds.Contains(item) && y.RoleIds != null
select new Model.UserItem
{
PersonId = x.PersonId,
@ -450,7 +450,7 @@ namespace BLL
{
var getDatas = (from x in db.Person_Persons
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
where y.ProjectId == projectId && y.States == Const.State_1 && x.RoleIds != null
where y.ProjectId == projectId && y.States == Const.State_1 && y.RoleIds != null
select new Model.UserItem
{
PersonId = x.PersonId,

22
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
View File

@ -20,22 +20,22 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
LabelAlign="right">
<f:TextBox runat="server" ID="txtCardNo" EmptyText="按编号查询" Width="150px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
<f:DropDownList ID="drpUnitId" runat="server" EmptyText="单位"
AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click" Width="280px">
</f:DropDownList>
<f:TextBox runat="server" Label="姓名" ID="txtPersonName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
<f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" Width="150px" LabelAlign="right">
</f:TextBox>
<f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
<f:TextBox runat="server" ID="txtWorkPostName" EmptyText="按岗位查询" Width="150px" LabelAlign="right">
</f:TextBox>
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true" Width="120px"
LabelAlign="Right" EmptyText="按状态查询" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
</f:ToolbarFill>
<f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="btSearch_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>

20
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs
View File

@ -45,7 +45,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
this.ProjectId = Request.Params["projectId"];
}
BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
DropListService.InitConstDropDownList(this.drpIsPost, DropListService.Group_IsPost, true);
this.drpIsPost.SelectedValue = Const._True;
if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
{
this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
@ -79,6 +82,19 @@ namespace FineUIPro.Web.HSSE.QualityAudit
strSql += " AND Person.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
}
if (this.drpIsPost.SelectedValue != Const._Null && !string.IsNullOrEmpty( this.drpIsPost.SelectedValue))
{
if (this.drpIsPost.SelectedValue == Const._True)
{
strSql += " AND Person.States =@States ";
listStr.Add(new SqlParameter("@States",Const.ProjectPersonStates_1));
}
else
{
strSql += " AND Person.States !=@States ";
listStr.Add(new SqlParameter("@States", Const.ProjectPersonStates_1));
}
}
if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
{
strSql += " AND Person.CardNo LIKE @CardNo";
@ -150,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
protected void btSearch_Click(object sender, EventArgs e)
{
this.BindGrid();
}

18
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPostName;
/// <summary>
/// drpIsPost 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsPost;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -104,6 +113,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary>
/// btnOut 控件。
/// </summary>