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/HJGL/WeldingReport/DetectionAnalyze.aspx.cs
+1 -1
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
+1 -1
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs
+2 -2
View File
@@ -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));
SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs
+3 -3
View File
@@ -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));
SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs
+1 -1
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs
+1 -1
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs
+1 -1
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs
+1 -1
View File
@@ -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;