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/Comprehensive/ContactList.aspx.cs
+2 -2
View File
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
btnNew.OnClientClick = Window1.GetShowReference("ContactListEdit.aspx") + "return false;";
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)
{
this.drpProposeUnit.Hidden = true;
}
@@ -84,7 +84,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", 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 a.UnitId='" + this.CurrUser.UnitId+"'";
}
SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactListEdit.aspx.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
ContactListId = Request.Params["ContactListId"];
this.State = "1";
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)
{
drpUnit.Enabled = false;
}
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs
+1 -1
View File
@@ -153,7 +153,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
+1 -1
View File
@@ -162,7 +162,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
+1 -1
View File
@@ -150,7 +150,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
+1 -1
View File
@@ -145,7 +145,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
var punit= ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId);
if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_TCC|| punit.UnitType==Const.ProjectUnitType_3)
if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_XJYJ|| punit.UnitType==Const.ProjectUnitType_3)
{
BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
}
SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFileEdit.aspx.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.FinalFileId = Request.Params["FinalFileId"];
BLL.UnitService.InitUnitDownList(this.dpUnit, this.CurrUser.LoginProjectId, true);
var punit = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId);
if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_TCC || punit.UnitType == Const.ProjectUnitType_3)
if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_XJYJ || punit.UnitType == Const.ProjectUnitType_3)
{
BLL.UnitService.InitUnitDownList(this.dpUnit, this.CurrUser.LoginProjectId, true);
}
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
+1 -1
View File
@@ -215,7 +215,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
+2 -2
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_TCC)
if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_XJYJ)
{
this.drpUnitId.Enabled = true;
}
@@ -169,7 +169,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+1 -1
View File
@@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
+1 -1
View File
@@ -163,7 +163,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs
+1 -1
View File
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs
+1 -1
View File
@@ -131,7 +131,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs
+1 -1
View File
@@ -149,7 +149,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
+1 -1
View File
@@ -138,7 +138,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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";
SGGL/FineUIPro.Web/CQMS/Information/EditVisaApplicationFinal.aspx.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Solution
txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
visaApplicationFinalId = Request.Params["visaApplicationFinalId"];
this.State = "1";
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)
{
drpUnit.Enabled = false;
}
SGGL/FineUIPro.Web/CQMS/Information/EditWorkOrderFinal.aspx.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Solution
txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
WorkOrderFinalId = Request.Params["WorkOrderFinalId"];
this.State = "1";
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)
{
drpUnit.Enabled = false;
}
SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs
+4 -4
View File
@@ -285,7 +285,7 @@ namespace FineUIPro.Web.CQMS.Information
Panel2.Enabled = false;
VisaApplicationService.Init(drpHandleType, Const.VisaApplication_Audit6, false);
var userList = from x in Funs.DB.Sys_User
where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true
where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true
select x;
drpHandleMan.DataValueField = "UserId";
drpHandleMan.DataTextField = "UserName";
@@ -305,7 +305,7 @@ namespace FineUIPro.Web.CQMS.Information
Panel2.Enabled = false;
VisaApplicationService.Init(drpHandleType, Const.VisaApplication_Audit7, false);
var userList = from x in Funs.DB.Sys_User
where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true
where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true
select x;
drpHandleMan.DataValueField = "UserId";
drpHandleMan.DataTextField = "UserName";
@@ -1561,7 +1561,7 @@ namespace FineUIPro.Web.CQMS.Information
else if (this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit7 || this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit8)
{
var userList = from x in Funs.DB.Sys_User
where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true
where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true
select x;
drpHandleMan.DataValueField = "UserId";
drpHandleMan.DataTextField = "UserName";
@@ -1638,7 +1638,7 @@ namespace FineUIPro.Web.CQMS.Information
else if (this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit7 || this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit8)
{
var userList = from x in Funs.DB.Sys_User
where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true
where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true
select x;
drpHandleMan.DataValueField = "UserId";
drpHandleMan.DataTextField = "UserName";
SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationFinal.aspx.cs
+2 -2
View File
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Information
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
btnNew.OnClientClick = Window1.GetShowReference("EditVisaApplicationFinal.aspx") + "return false;";
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)
{
this.drpProposeUnit.Hidden = true;
}
@@ -88,7 +88,7 @@ namespace FineUIPro.Web.CQMS.Information
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", 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 solution.UnitId='" + this.CurrUser.UnitId+"'";
}
SGGL/FineUIPro.Web/CQMS/Information/WorkOrderFinal.aspx.cs
+2 -2
View File
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Information
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
btnNew.OnClientClick = Window1.GetShowReference("EditWorkOrderFinal.aspx") + "return false;";
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)
{
this.drpProposeUnit.Hidden = true;
}
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.CQMS.Information
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", 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 solution.UnitId='" + this.CurrUser.UnitId+"'";
}
SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReportEdit.aspx.cs
+1 -1
View File
@@ -143,7 +143,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.InformationProject_QualityWorkSummaryReport report = new Model.InformationProject_QualityWorkSummaryReport
{
ProjectId = this.ProjectId,
UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId,
UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId,
};
if (this.ddlYearId.SelectedValue != BLL.Const._Null)
{
SGGL/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQualityEdit.aspx.cs
+1 -1
View File
@@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.InformationProject_QuarterlyProjectQuality quarterlyProjectQuality = new Model.InformationProject_QuarterlyProjectQuality
{
ProjectId = this.ProjectId,
UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId,
UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId,
QualityManagePersonNum = Funs.GetNewInt(this.txtQualityManagePersonNum.Text.Trim()),
AdvancedTitlePersonNum = Funs.GetNewInt(this.txtAdvancedTitlePersonNum.Text.Trim()),
IntermediateTitlePersonNum = Funs.GetNewInt(this.txtIntermediateTitlePersonNum.Text.Trim()),
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";
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
+2 -2
View File
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.CQMS.Solution
CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
btnNew.OnClientClick = window_tt.GetShowReference("EditConstructSolution.aspx") + "return false;";
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)
{
this.drpProposeUnit.Hidden = true;
}
@@ -137,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Solution
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", 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 chec.UnitId='" + this.CurrUser.UnitId + "'";
}
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs
+2 -2
View File
@@ -48,7 +48,7 @@ namespace FineUIPro.Web.CQMS.Solution
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpSolutionType, true);
btnNew.OnClientClick = Window1.GetShowReference("EditConstructSolutionFinal.aspx") + "return false;";
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)
{
this.drpProposeUnit.Hidden = true;
}
@@ -90,7 +90,7 @@ namespace FineUIPro.Web.CQMS.Solution
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", 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 solution.UnitId='" + this.CurrUser.UnitId+"'";
}
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
+1 -1
View File
@@ -102,7 +102,7 @@ namespace FineUIPro.Web.CQMS.Solution
BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false);
BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(drpSpecialType,1, false);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
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)
{
drpUnit.SelectedValue = this.CurrUser.UnitId;
drpUnit.Enabled = false;
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolutionFinal.aspx.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Solution
txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
ConstructSolutionId = Request.Params["constructSolutionId"];
this.State = "1";
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)
{
drpUnit.Enabled = false;
}
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecordEdit.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CQMS.WBS
var userList = from x in Funs.DB.Sys_User
join p in Funs.DB.Project_ProjectUser
on x.UserId equals p.UserId
where x.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId
where x.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId
select new { UserId = x.UserId, UserName = x.UserName };
dpAuditer.DataValueField = "UserId";
dpAuditer.DataTextField = "UserName";