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

20210816

Browse Source
This commit is contained in:
杨红卫
2021-08-16 17:41:00 +08:00
parent dfd370a9b0
commit dba64994c3
44 changed files with 1962 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs
+33 -10
View File
@@ -53,6 +53,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.ProjectId = this.CurrUser.LoginProjectId;
///区域下拉框
BLL.UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.ProjectId, true);
UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId))
{
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
this.drpUnit.Enabled = false;
}
BindGrid(string.Empty);
this.CheckingId = Request.Params["CheckingId"];
if (!string.IsNullOrEmpty(Request.Params["type"]))
@@ -145,14 +151,25 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// <param name="e"></param>
protected void drpWorkArea_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpWorkArea.SelectedValue != BLL.Const._Null)
string selectName = string.Empty;
foreach (var item in this.drpWorkArea.SelectedValueArray)
{
this.txtWorkArea.Text = this.drpWorkArea.SelectedText;
}
else
{
this.txtWorkArea.Text = string.Empty;
if (item != Const._Null)
{
string text = this.drpWorkArea.Items.FindByValue(item).Text;
if (string.IsNullOrEmpty(selectName))
{
selectName = text;
}
else
{
selectName += ","+ text;
}
}
}
this.txtWorkArea.Text = selectName;
this.drpWorkArea.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpWorkArea.SelectedValueArray);
}
#endregion
@@ -175,12 +192,18 @@ namespace FineUIPro.Web.HSSE.SitePerson
string strSql = @"SELECT Person.PersonId,Person.CardNo,Person.PersonName,Person.IdentityCard,Person.UnitId,Person.WorkPostId,Unit.UnitName,WorkPost.WorkPostName "
+ @" FROM SitePerson_Person AS Person "
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId "
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON WorkPost.WorkPostId = Person.WorkPostId WHERE ProjectId='" + this.ProjectId + "'";
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON WorkPost.WorkPostId = Person.WorkPostId "
+@" WHERE IsUsed =1 AND (OutTime IS NULL OR OutTime > GETDATE()) AND ProjectId='" + this.ProjectId + "'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
//if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
//{
// strSql += " AND Person.CardNo LIKE @CardNo";
// listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
//}
if (this.drpUnit.SelectedValue != Const._Null)
{
strSql += " AND Person.CardNo LIKE @CardNo";
listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
strSql += " AND Person.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim()))
{