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

项目人员信息档案新增、导入补充：机构划分、组织单元、人员分类、员工子组、备注信息

Browse Source
This commit is contained in:
夏菊
2025-08-08 17:54:10 +08:00
parent fd849d42e1
commit 8e4dec9037
212 changed files with 2489 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
+ @" WHERE P.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
strSql += " AND P.UnitId='" + this.CurrUser.UnitId + "'";
}
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs
+1 -1
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where p.RoleId.Contains(Const.ZBCNEngineer)
where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
select new { UserId = x.UserId, UserName = x.UserName };
drpAudit.DataValueField = "UserId";
drpAudit.DataTextField = "UserName";
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
+ @" WHERE P.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
strSql += " AND P.UnitId='" + this.CurrUser.UnitId + "'";
}
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
+3 -3
View File
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
drpUnit.DataBind();
drpUnit.SelectedValue = this.CurrUser.UnitId;
if ( this.CurrUser.UnitId==Const.UnitId_TCC|| this.CurrUser.UserId ==Const.hfnbdId)
if ( this.CurrUser.UnitId==Const.UnitId_XJYJ|| this.CurrUser.UserId ==Const.hfnbdId)
{
drpUnit.Enabled= true;
}
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
}
drpMainSendUnit.DataValueField = "UnitId";
drpMainSendUnit.DataTextField = "UnitName";
drpMainSendUnit.DataSource = Funs.DB.Base_Unit.Where(x => x.UnitId == Const.UnitId_TCC).ToList();
drpMainSendUnit.DataSource = Funs.DB.Base_Unit.Where(x => x.UnitId == Const.UnitId_XJYJ).ToList();
drpMainSendUnit.DataBind();
drpMainSendUnit.SelectedValue = this.CurrUser.UnitId;
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where p.RoleId.Contains(Const.ZBCNEngineer)
select new { UserId = x.UserId, UserName=x.UserName };
drpAudit.DataValueField = "UserId";