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

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
@@ -127,7 +127,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
{
this.drpUnit.Enabled = true;
}
else if(this.CurrUser.UnitId !=Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId)
else if(this.CurrUser.UnitId !=Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId)
{
this.drpUnit.Enabled = false;
}
@@ -228,7 +228,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
rootUnitNode.Expanded = true;
rootUnitNode.ToolTip = "施工单位";
rootNode.Nodes.Add(rootUnitNode);
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId&&!showAll)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId&&!showAll)
{
if (!string.IsNullOrEmpty(txtTrust.Text))
{
@@ -615,7 +615,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.drpInstallationId.SelectedIndex = 0;
//加载编号
string prefixCode = string.Empty;
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpHotHardUnit.SelectedValue);
if (!string.IsNullOrEmpty(tccCode))
{
@@ -640,7 +640,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
{
//加载编号
string prefixCode = string.Empty;
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpHotHardUnit.SelectedValue);
var area = BLL.WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, this.drpInstallationId.SelectedValue, this.drpHotHardUnit.SelectedValue);
if (!string.IsNullOrEmpty(tccCode))
@@ -598,7 +598,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
//加载编号
string prefixCode = string.Empty;
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue);
if (!string.IsNullOrEmpty(tccCode))
{
@@ -623,7 +623,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
{
//加载编号
string prefixCode = string.Empty;
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue);
var area = BLL.WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, this.drpInstallationId.SelectedValue, this.drpUnit.SelectedValue);
if (!string.IsNullOrEmpty(tccCode))
@@ -577,7 +577,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
//加载编号
string prefixCode = string.Empty;
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue);
if (!string.IsNullOrEmpty(tccCode))
{
@@ -602,7 +602,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
{
//加载编号
string prefixCode = string.Empty;
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue);
var area = BLL.WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, this.drpInstallationId.SelectedValue, this.drpUnit.SelectedValue);
if (!string.IsNullOrEmpty(tccCode))
@@ -65,7 +65,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
State = "1";
this.txtProjectName.Text = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.dpApplyUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId)
if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId)
{
this.dpApplyUnit.SelectedValue = CurrUser.UnitId;
this.dpApplyUnit.Enabled = false;
@@ -84,7 +84,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
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 };
drpHandleMan.DataValueField = "UserId";
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
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";
@@ -52,7 +52,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
drpRes.DataBind();
Funs.FineUIPleaseSelect(drpRes);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
Funs.FineUIPleaseSelect(drpTeamGroupId);
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
Funs.FineUIPleaseSelect(drpTeamGroupId);
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC)
if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ)
{
drpUnitId.Enabled = true;
}
@@ -104,7 +104,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
strSql += " AND testApplication.ExamDate <= @endDate";
listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim()));
}
if (this.CurrUser.UnitId != BLL.Const.UnitId_TCC)
if (this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ)
{
var user = BLL.ProjectUserService.GetCurrProjectUserByUserId(this.CurrUser.UserId);
if (user != null)
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
this.drpCH_TrustUnit.DataSource = pUnit;
this.drpCH_TrustUnit.DataBind();
this.drpCH_TrustUnit.SelectedValue = this.CurrUser.UnitId;
if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId)
if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId)
{
this.drpCH_TrustUnit.Enabled = false;
}
@@ -1056,7 +1056,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
this.drpInstallationId.SelectedIndex = 0;
//加载委托单号
string prefixCode = string.Empty;
var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
// var trustUnitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpCH_TrustUnit.SelectedValue);
// prefixCode = "RK-" + epcUnitCode + "-" + trustUnitCode + "-";
@@ -1085,7 +1085,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
//{
// areaCode = workarea.WorkAreaCode;
//}
//var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
//var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
//var trustUnitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpCH_TrustUnit.SelectedValue);
//prefixCode = "RK-" + epcUnitCode + "-" + trustUnitCode + "-" + areaCode + "-";
@@ -1111,7 +1111,7 @@ namespace FineUIPro.Web.HJGL.RepairManage
//{
// areaCode = workarea.WorkAreaCode;
//}
//var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC);
//var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ);
//var trustUnitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpCH_TrustUnit.SelectedValue);
//var ndtt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(this.drpCH_NDTMethod.SelectedValue);
//if (ndtt != null)
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
this.drpUnitId.DataSource = pUnit;
this.drpUnitId.DataBind();
this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId)
if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId)
{
this.drpUnitId.Enabled = false;
}
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
this.drpCH_TrustUnit.DataBind();
this.drpCH_TrustUnit.SelectedValue = CurrUser.UnitId;
if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId)
if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId)
{
this.drpCH_TrustUnit.Enabled = false;
}
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.drpUnit.DataSource = pUnit;
this.drpUnit.DataBind();
this.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)
{
this.drpUnit.Enabled = false;
}
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
///施工区域下拉
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit != null&& unit.UnitId!=Const.UnitId_TCC)
if (unit != null&& unit.UnitId!=Const.UnitId_XJYJ)
{
BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
var getpu = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, unit.UnitId);
@@ -94,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.drpUnit.DataBind();
this.drpUnit.SelectedValue = this.hdUnitId.Text;
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId)
{
this.drpUnit.Enabled = false;
}
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
//var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
// var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
// if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2)
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
// var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
// if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2)
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
}
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
strSql += " AND WorkAreaId =@workareaId";
listStr.Add(new SqlParameter("@workareaId", this.drpWorkArea.SelectedValue));
}
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId)
{
strSql += " AND UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
// var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
// if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2)
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
//BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
//this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -84,7 +84,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
listStr.Add(new SqlParameter("@workareaId", this.drpWorkArea.SelectedValue));
}
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId)
{
strSql += " AND v.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
@@ -180,7 +180,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
listStr.Add(new SqlParameter("@workareaId", this.drpWorkArea.SelectedValue));
}
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId)
{
strSql += " AND v.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
// var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
// if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2)
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
//var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (this.CurrUser.UnitId!=Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId!=Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
// var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
// if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2)
if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId)
{
BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -31,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
//单位
// var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
//if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2)
if (this.CurrUser.UnitId!=Const.UnitId_TCC&&this.CurrUser.UserId!=Const.hfnbdId)
if (this.CurrUser.UnitId!=Const.UnitId_XJYJ&&this.CurrUser.UserId!=Const.hfnbdId)
{
BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true);
this.drpUnit.SelectedValue = this.CurrUser.UnitId;