From f5ab6ad44fdc4e9919745d680fb2dbb146cc86f4 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 7 Sep 2022 10:41:18 +0800 Subject: [PATCH] =?UTF-8?q?20220907=E7=89=B9=E5=B2=97=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E6=98=AF=E5=90=A6=E5=9C=A8=E5=B2=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_V2022-09-06修改明细.txt | 5 +++++ .../版本日志/SGGLDB_V2022-09-07修改明细.txt | 3 +++ SGGL/BLL/API/APIUserService.cs | 8 +++---- .../HSSE/QualityAudit/PersonQuality.aspx | 22 +++++++++---------- .../HSSE/QualityAudit/PersonQuality.aspx.cs | 20 +++++++++++++++-- .../PersonQuality.aspx.designer.cs | 18 +++++++++++++++ 6 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt new file mode 100644 index 00000000..6000a5b9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt @@ -0,0 +1,5 @@ +--ADD BY YangHongwei 2022-09-06 +1、项目劳务人员合同信息填报功能增加。 +2、人员查看页面完善。 +3、人员接口优化。 +--END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt new file mode 100644 index 00000000..15392721 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt @@ -0,0 +1,3 @@ +--ADD BY YangHongwei 2022-09-07 +1、特岗人员资质列表页面新增按是否在岗查询。 +--END \ No newline at end of file diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index f34ca2e9..d55310fd 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -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, diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx index 920df13e..fb4531f6 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx @@ -20,22 +20,22 @@ - + - + - + - + + + - - + + diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs index 3e4cefc9..07a97362 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs @@ -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 /// /// /// - protected void TextBox_TextChanged(object sender, EventArgs e) + protected void btSearch_Click(object sender, EventArgs e) { this.BindGrid(); } diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs index 38cb9d12..86cd8e69 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit /// protected global::FineUIPro.TextBox txtWorkPostName; + /// + /// drpIsPost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsPost; + /// /// ToolbarFill1 控件。 /// @@ -104,6 +113,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit /// protected global::FineUIPro.ToolbarFill ToolbarFill1; + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + /// /// btnOut 控件。 ///