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/BaseInfo/BaseFactoryEdit.aspx.cs
+1 -1
View File
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.BaseInfo
return;
}
Model.Base_Factory table = new Model.Base_Factory();
table.UnitId = BLL.Const.UnitId_TCC;
table.UnitId = BLL.Const.UnitId_XJYJ;
table.FactoryCode = this.txtFactoryCode.Text;
table.FactoryName = this.txtFactoryName.Text;
table.Address = this.txtAddress.Text;
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";
SGGL/FineUIPro.Web/Controls/UnitProjectTControl.ascx.cs
+2 -2
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.Controls
{
if (!IsPostBack)
{
this.UnitId = this.UnitId ?? BLL.Const.UnitId_TCC;
this.UnitId = this.UnitId ?? BLL.Const.UnitId_XJYJ;
this.ProjectId=this.ProjectId;
////加载树
SetSubUnitProjectTree(this.tvProject);
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.Controls
public void SetSubUnitProjectTree(FineUIPro.Tree tvProject)
{
tvProject.Nodes.Clear();
if (BLL.Const.UnitId_TCC == this.UnitId)
if (BLL.Const.UnitId_XJYJ == this.UnitId)
{
var getSubUnit = from x in Funs.DB.Base_Unit
where x.UnitId == this.UnitId || x.IsBranch == true
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）";
this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）";
this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）";
this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）";
this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）";
this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）";
}
}
#endregion
SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs
+2 -2
View File
@@ -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))
{
SGGL/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs
+2 -2
View File
@@ -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))
SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageByPipe.aspx.cs
+2 -2
View File
@@ -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))
SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
+2 -2
View File
@@ -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))
SGGL/FineUIPro.Web/HJGL/MaterialManage/MaterialApplyEdit.aspx.cs
+2 -2
View File
@@ -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";
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManage.aspx.cs
+1 -1
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManageEdit.aspx.cs
+2 -2
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs
+1 -1
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs
+1 -1
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs
+1 -1
View File
@@ -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)
SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs
+4 -4
View File
@@ -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)
SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageEdit.aspx.cs
+1 -1
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs
+1 -1
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
+1 -1
View File
@@ -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;
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs
+1 -1
View File
@@ -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);
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+1 -1
View File
@@ -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;
}
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;
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherEdit.aspx.cs
+1 -1
View File
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.HSSE.Accident
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
var unit = UnitService.GetUnitByUnitId(Const.UnitId_TCC);
var unit = UnitService.GetUnitByUnitId(Const.UnitId_XJYJ);
if (unit != null && !string.IsNullOrEmpty(unit.UnitCode))
{
string url = "../../Images/SUBimages/" + unit.UnitCode + ".jpg";
SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherView.aspx.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Accident
{
if (!IsPostBack)
{
var thisunit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_TCC);
var thisunit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_XJYJ);
if (thisunit != null && !string.IsNullOrEmpty(thisunit.UnitCode))
{
string url = "../../Images/SUBimages/" + thisunit.UnitCode + ".jpg";
SGGL/FineUIPro.Web/HSSE/Check/CheckWorkEdit.aspx.cs
+1 -1
View File
@@ -124,7 +124,7 @@ namespace FineUIPro.Web.HSSE.Check
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
//var thisUnit = BLL.CommonService.GetIsThisUnit();
//if (thisUnit != null && thisUnit.UnitId == Const.UnitId_CWCEC)
if (this.CurrUser.UnitId == Const.UnitId_TCC)
if (this.CurrUser.UnitId == Const.UnitId_XJYJ)
{
SaveNew(true);
}
SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace FineUIPro.Web.HSSE.Check
Funs.FineUIPleaseSelect(this.drpTeamGroup);
Funs.FineUIPleaseSelect(this.drpPerson);
BLL.ConstValue.InitConstValueDropDownList(this.drpRewardType, BLL.ConstValue.Group_RewardType, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
//BindGrid(string.Empty);
this.IncentiveNoticeId = Request.Params["IncentiveNoticeId"];
this.txtCurrency.Text = "人民币";
SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeEdit.aspx.cs
+4 -4
View File
@@ -149,14 +149,14 @@ namespace FineUIPro.Web.HSSE.Check
{
this.IsAgree.Hidden = false;
this.GroupPanel2.Hidden = false;
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理
this.drpHandleMan.Label = "总包项目经理";
if (!string.IsNullOrEmpty(incentiveNotice.ApproveMan))
{
this.drpHandleMan.SelectedValue = incentiveNotice.ApproveMan;
}
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);//分包单位
}
@@ -348,7 +348,7 @@ namespace FineUIPro.Web.HSSE.Check
this.NoAgree.Hidden = true;
if (State == "1")
{
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理
this.drpHandleMan.Label = "总包项目经理";
this.GroupPanel2.Hidden = false;
}
SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeAdd.aspx.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace FineUIPro.Web.HSSE.Check
this.ProjectId = this.CurrUser.LoginProjectId;
this.PauseNoticeId = Request.Params["PauseNoticeId"];
this.InitDropDownList();
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC,Const.ConstructionManager, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ,Const.ConstructionManager, true);
if (!string.IsNullOrEmpty(PauseNoticeId))
{
SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeEdit.aspx.cs
+5 -5
View File
@@ -118,16 +118,16 @@ namespace FineUIPro.Web.HSSE.Check
{
this.IsAgree.Hidden = false;
//UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, Const.ProjectManager, true);
//UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, Const.ProjectManager, true);
this.drpHandleMan.Label = "总包项目经理";
if (!string.IsNullOrEmpty(pauseNotice.ApproveManId)) {
this.drpHandleMan.SelectedValue = pauseNotice.ApproveManId;
}
this.GroupPanel2.Hidden = false;
gvCarryUser.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, Const.UnitId_TCC);
gvCarryUser.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, Const.UnitId_XJYJ);
gvCarryUser.DataBind();//专业工程师
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, Const.ConstructionManager, true);
BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, Const.ConstructionManager, true);
//施工经理
//UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);//分包单位
girdConMan.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue);
@@ -442,7 +442,7 @@ namespace FineUIPro.Web.HSSE.Check
this.NoAgree.Hidden = true;
if (State == "1") {
UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
this.drpHandleMan.Label = "总包项目经理";
this.GroupPanel2.Hidden = false;
}
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs
+3 -3
View File
@@ -60,8 +60,8 @@ namespace FineUIPro.Web.HSSE.Check
this.InitDropDownList();
this.PunishNoticeId = Request.Params["PunishNoticeId"];
this.txtCurrency.Text = "人民币";
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
if (!string.IsNullOrEmpty(this.PunishNoticeId))
{
BindGrid();
@@ -495,7 +495,7 @@ namespace FineUIPro.Web.HSSE.Check
}
else
{
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
}
}
}
SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs
+4 -4
View File
@@ -133,14 +133,14 @@ namespace FineUIPro.Web.HSSE.Check
{
this.IsAgree.Hidden = false;
this.GroupPanel2.Hidden = false;
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理
this.drpHandleMan.Label = "总包施工经理";
if (!string.IsNullOrEmpty(punishNotice.ApproveMan))
{
this.drpHandleMan.SelectedValue = punishNotice.ApproveMan;
}
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);//分包单位
}
@@ -430,7 +430,7 @@ namespace FineUIPro.Web.HSSE.Check
this.NoAgree.Hidden = true;
if (State == "1")
{
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包施工经理
this.drpHandleMan.Label = "总包施工经理";
this.GroupPanel2.Hidden = false;
}
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
+4 -4
View File
@@ -36,11 +36,11 @@ namespace FineUIPro.Web.HSSE.Check
{
RectifyNoticesId = Request.Params["RectifyNoticesId"];
/// 专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
/// 施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
/// 项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
var getRectifyNotices = RectifyNoticesService.GetRectifyNoticesById(RectifyNoticesId);
if (getRectifyNotices != null)
{
@@ -292,7 +292,7 @@ namespace FineUIPro.Web.HSSE.Check
//else if (getRectifyNotices.States == Const.State_3)
//{
// this.drpOperateMan.Label = "安全经理/安全工程师";
// UserService.InitUserProjectIdUnitIdDropDownList(this.drpOperateMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
// UserService.InitUserProjectIdUnitIdDropDownList(this.drpOperateMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
// this.drpOperateMan.SelectedValue = getRectifyNotices.CompleteManId;
//}
}
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
+5 -5
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.HSSE.Check
//区域
BLL.UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.CurrUser.LoginProjectId, true);
///安全经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
///检察人员
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true);
@@ -138,9 +138,9 @@ namespace FineUIPro.Web.HSSE.Check
//this.Itemcontent.Hidden = true;
//this.btnSure.Hidden = true;
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpDutyPerson, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);//接收人
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//项目经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//项目经理
var datas = Grid1.GetMergedData();
if (datas != null)
@@ -234,7 +234,7 @@ namespace FineUIPro.Web.HSSE.Check
//this.Itemcontent.Hidden = true;
//this.btnSure.Hidden = true;
//复查人
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
this.drpCheckPerson.SelectedValue = RectifyNotices.CompleteManId;
}
else if (State == "4")
SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationEdit.aspx.cs
+1 -1
View File
@@ -681,7 +681,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
if (string.IsNullOrEmpty(payRegistration.UnitId))
{
payRegistration.UnitId = BLL.Const.UnitId_TCC;
payRegistration.UnitId = BLL.Const.UnitId_XJYJ;
}
if (!string.IsNullOrEmpty(this.PayRegistrationId))
{
SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistrationEdit.aspx.cs
+2 -2
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
///单位下拉框
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, false);
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
if (unit == null || (unit != null && unit.UnitId == BLL.Const.UnitId_TCC))
if (unit == null || (unit != null && unit.UnitId == BLL.Const.UnitId_XJYJ))
{
this.txtSMainApproveType1.Readonly = false;
this.txtSMainApproveType2.Readonly = false;
@@ -353,7 +353,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
this.txtSMonthTypeTotal7.Text = Convert.ToString(sMonthType29);//文明施工和环境保护 当月累计 费用小计
this.txtSMonthTypeTotal.Text = Convert.ToString(Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal1.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal2.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal3.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal4.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal5.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal6.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal7.Text));
}
if (unit != null && unit.UnitId != BLL.Const.UnitId_TCC)
if (unit != null && unit.UnitId != BLL.Const.UnitId_XJYJ)
{
this.drpUnit.Enabled = false;
}
SGGL/FineUIPro.Web/HSSE/CostGoods/TotalPayRegistrationView.aspx.cs
+94 -94
View File
@@ -72,7 +72,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
int b = 5;
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row1[b] = payRegistrations.Sum(x => x.SMonthType1_1 ?? 0);
row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row2[4] = "施工现场和特殊界区管理出入证、通行证制证、制卡";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row2[b] = payRegistrations.Sum(x => x.SMonthType1_2 ?? 0);
row2[b] = Funs.GetNewDecimalOrZero(row2[b].ToString()).ToString("N2");
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row3[4] = "安全、环保、应急管理文档汇集、编辑、分析";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row3[b] = payRegistrations.Sum(x => x.SMonthType1_3 ?? 0);
row3[b] = Funs.GetNewDecimalOrZero(row3[b].ToString()).ToString("N2");
@@ -159,7 +159,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row4[4] = "安全检测、监测、评定、评价";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row4[b] = payRegistrations.Sum(x => x.SMonthType1_4 ?? 0);
row4[b] = Funs.GetNewDecimalOrZero(row4[b].ToString()).ToString("N2");
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row5[4] = "报刊、标语、参考书、宣传画、音像制品等宣传品和现场宣传栏";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row5[b] = payRegistrations.Sum(x => x.SMonthType1_5 ?? 0);
row5[b] = Funs.GetNewDecimalOrZero(row5[b].ToString()).ToString("N2");
@@ -217,7 +217,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row6[4] = "员工进出场信息采集识别管理系统（含摄录存取及分析器材）购置、折旧或租赁费";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row6[b] = payRegistrations.Sum(x => x.SMonthType1_6 ?? 0);
row6[b] = Funs.GetNewDecimalOrZero(row6[b].ToString()).ToString("N2");
@@ -246,7 +246,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row7[4] = "射线、风速、噪声、温湿度、粉尘、空气质量检测仪器购置、折旧或租赁费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row7[b] = payRegistrations.Sum(x => x.SMonthType1_7 ?? 0);
row7[b] = Funs.GetNewDecimalOrZero(row7[b].ToString()).ToString("N2");
@@ -275,7 +275,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row8[4] = "气液成分、电气安全、力学特性、热工特性和几何量检测仪器购置、折旧或租赁费";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row8[b] = payRegistrations.Sum(x => x.SMonthType1_8 ?? 0);
row8[b] = Funs.GetNewDecimalOrZero(row8[b].ToString()).ToString("N2");
@@ -304,7 +304,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row9[4] = "监测、检测辅助器具";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row9[b] = payRegistrations.Sum(x => x.SMonthType1_9 ?? 0);
row9[b] = Funs.GetNewDecimalOrZero(row9[b].ToString()).ToString("N2");
@@ -333,7 +333,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row10[4] = "警戒警示通讯器材（对讲机、望远镜、测距仪）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row10[b] = payRegistrations.Sum(x => x.SMonthType1_10 ?? 0);
row10[b] = Funs.GetNewDecimalOrZero(row10[b].ToString()).ToString("N2");
@@ -362,7 +362,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row11[4] = "监测检测计量器具执行检定和维修费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row11[b] = payRegistrations.Sum(x => x.SMonthType1_11 ?? 0);
row11[b] = Funs.GetNewDecimalOrZero(row11[b].ToString()).ToString("N2");
@@ -391,7 +391,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row12[4] = "风险突出处安全警示标志牌、警示灯、警戒线、提示牌等";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row12[b] = payRegistrations.Sum(x => x.SMonthType1_12 ?? 0);
row12[b] = Funs.GetNewDecimalOrZero(row12[b].ToString()).ToString("N2");
@@ -420,7 +420,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row13[4] = "各工种、各类施工机械的安全操作规程牌";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row13[b] = payRegistrations.Sum(x => x.SMonthType1_13 ?? 0);
row13[b] = Funs.GetNewDecimalOrZero(row13[b].ToString()).ToString("N2");
@@ -449,7 +449,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row14[4] = "特殊标识、标识设置";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row14[b] = payRegistrations.Sum(x => x.SMonthType1_14 ?? 0);
row14[b] = Funs.GetNewDecimalOrZero(row14[b].ToString()).ToString("N2");
@@ -478,7 +478,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row15[4] = "表彰安全先进集体、个人的奖励";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row15[b] = payRegistrations.Sum(x => x.SMonthType1_15 ?? 0);
row15[b] = Funs.GetNewDecimalOrZero(row15[b].ToString()).ToString("N2");
@@ -507,7 +507,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row16[4] = "其它安全生产管理直接相关的支出";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row16[b] = payRegistrations.Sum(x => x.SMonthType1_16 ?? 0);
row16[b] = Funs.GetNewDecimalOrZero(row16[b].ToString()).ToString("N2");
@@ -536,7 +536,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row17[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row17[b] = payRegistrations.Sum(x => x.SMonthType1_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_6 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_7 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_8 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_9 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_10 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_11 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_12 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_13 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_14 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_15 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_16 ?? 0);
row17[b] = Funs.GetNewDecimalOrZero(row17[b].ToString()).ToString("N2");
@@ -567,7 +567,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row18[4] = "专项方案中非常规安全措施费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row18[b] = payRegistrations.Sum(x => x.SMonthType2_1 ?? 0);
row18[b] = Funs.GetNewDecimalOrZero(row18[b].ToString()).ToString("N2");
@@ -596,7 +596,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row19[4] = "与安全相关的专项方案专家论证审查费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row19[b] = payRegistrations.Sum(x => x.SMonthType2_2 ?? 0);
row19[b] = Funs.GetNewDecimalOrZero(row19[b].ToString()).ToString("N2");
@@ -625,7 +625,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row20[4] = "各类安全技术方案的编制和咨询费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row20[b] = payRegistrations.Sum(x => x.SMonthType2_3 ?? 0);
row20[b] = Funs.GetNewDecimalOrZero(row20[b].ToString()).ToString("N2");
@@ -654,7 +654,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row21[4] = "安全技术进步专项费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row21[b] = payRegistrations.Sum(x => x.SMonthType2_4 ?? 0);
row21[b] = Funs.GetNewDecimalOrZero(row21[b].ToString()).ToString("N2");
@@ -683,7 +683,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row22[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row22[b] = payRegistrations.Sum(x => x.SMonthType2_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_4 ?? 0);
row22[b] = Funs.GetNewDecimalOrZero(row22[b].ToString()).ToString("N2");
@@ -714,7 +714,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row23[4] = "通风、降温、保暖、除尘、防眩光设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row23[b] = payRegistrations.Sum(x => x.SMonthType3_1 ?? 0);
row23[b] = Funs.GetNewDecimalOrZero(row23[b].ToString()).ToString("N2");
@@ -743,7 +743,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row24[4] = "职业病预防措施和有害作业工种保健费";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row24[b] = payRegistrations.Sum(x => x.SMonthType3_2 ?? 0);
row24[b] = Funs.GetNewDecimalOrZero(row24[b].ToString()).ToString("N2");
@@ -772,7 +772,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row25[4] = "特殊环境作业和特殊要求行业人员体检费";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row25[b] = payRegistrations.Sum(x => x.SMonthType3_3 ?? 0);
row25[b] = Funs.GetNewDecimalOrZero(row25[b].ToString()).ToString("N2");
@@ -801,7 +801,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row26[4] = "女工休息室、特殊作业人员休息室";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row26[b] = payRegistrations.Sum(x => x.SMonthType3_4 ?? 0);
row26[b] = Funs.GetNewDecimalOrZero(row26[b].ToString()).ToString("N2");
@@ -830,7 +830,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row27[4] = "水泥等其他易飞扬颗粒建筑材料封闭放置和遮盖措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row27[b] = payRegistrations.Sum(x => x.SMonthType3_5 ?? 0);
row27[b] = Funs.GetNewDecimalOrZero(row27[b].ToString()).ToString("N2");
@@ -859,7 +859,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row28[4] = "边角余料，废旧材料清理回收措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row28[b] = payRegistrations.Sum(x => x.SMonthType3_6 ?? 0);
row28[b] = Funs.GetNewDecimalOrZero(row28[b].ToString()).ToString("N2");
@@ -888,7 +888,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row29[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row29[b] = payRegistrations.Sum(x => x.SMonthType3_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_6 ?? 0);
row29[b] = Funs.GetNewDecimalOrZero(row29[b].ToString()).ToString("N2");
@@ -919,7 +919,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row30[4] = "漏电保护器";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row30[b] = payRegistrations.Sum(x => x.SMonthType4_1 ?? 0);
row30[b] = Funs.GetNewDecimalOrZero(row30[b].ToString()).ToString("N2");
@@ -948,7 +948,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row31[4] = "保护接地装置，大型机具设备的防雷接地";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row31[b] = payRegistrations.Sum(x => x.SMonthType4_2 ?? 0);
row31[b] = Funs.GetNewDecimalOrZero(row31[b].ToString()).ToString("N2");
@@ -977,7 +977,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row32[4] = "受限空间使用的低压照明设备（隔离变压器、低压照明灯、专用配电箱）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row32[b] = payRegistrations.Sum(x => x.SMonthType4_3 ?? 0);
row32[b] = Funs.GetNewDecimalOrZero(row32[b].ToString()).ToString("N2");
@@ -1006,7 +1006,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row33[4] = "基坑及安全措施费隐蔽工程动土安全措施费（防坍塌措施）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row33[b] = payRegistrations.Sum(x => x.SMonthType4_4 ?? 0);
row33[b] = Funs.GetNewDecimalOrZero(row33[b].ToString()).ToString("N2");
@@ -1035,7 +1035,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row34[4] = "孔、洞、井的防护盖板和防护栏杆";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row34[b] = payRegistrations.Sum(x => x.SMonthType4_5 ?? 0);
row34[b] = Funs.GetNewDecimalOrZero(row34[b].ToString()).ToString("N2");
@@ -1064,7 +1064,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row35[4] = "其它临边防护材料（如安全网、踢脚板等）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row35[b] = payRegistrations.Sum(x => x.SMonthType4_6 ?? 0);
row35[b] = Funs.GetNewDecimalOrZero(row35[b].ToString()).ToString("N2");
@@ -1093,7 +1093,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row36[4] = "有防坠物要求的棚房设施建筑物临边和施工通道的隔离防护棚";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row36[b] = payRegistrations.Sum(x => x.SMonthType4_7 ?? 0);
row36[b] = Funs.GetNewDecimalOrZero(row36[b].ToString()).ToString("N2");
@@ -1122,7 +1122,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row37[4] = "防坠物措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row37[b] = payRegistrations.Sum(x => x.SMonthType4_8 ?? 0);
row37[b] = Funs.GetNewDecimalOrZero(row37[b].ToString()).ToString("N2");
@@ -1151,7 +1151,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row38[4] = "钢结构安装时脚手架等安全措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row38[b] = payRegistrations.Sum(x => x.SMonthType4_9 ?? 0);
row38[b] = Funs.GetNewDecimalOrZero(row38[b].ToString()).ToString("N2");
@@ -1180,7 +1180,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row39[4] = "高处作业下方区域警戒围护";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row39[b] = payRegistrations.Sum(x => x.SMonthType4_10 ?? 0);
row39[b] = Funs.GetNewDecimalOrZero(row39[b].ToString()).ToString("N2");
@@ -1209,7 +1209,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row40[4] = "其他高处作业安全措施（注：脚手架体、爬梯和通道等施工必要设施不属于安全防护措施，但护栏、安全网、挡脚板、生命线等属于安全防护措施）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row40[b] = payRegistrations.Sum(x => x.SMonthType4_11 ?? 0);
row40[b] = Funs.GetNewDecimalOrZero(row40[b].ToString()).ToString("N2");
@@ -1238,7 +1238,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row41[4] = "为确保建构筑物、钢构、设备施工安全而搭设的操作平台的防护栏杆和踢脚板；洞口临边护栏和盖板、平网、立网（密网）；安全通道的侧护栏和防砸顶板等。";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row41[b] = payRegistrations.Sum(x => x.SMonthType4_12 ?? 0);
row41[b] = Funs.GetNewDecimalOrZero(row41[b].ToString()).ToString("N2");
@@ -1267,7 +1267,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row42[4] = "通风、降温、防触电和消防设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row42[b] = payRegistrations.Sum(x => x.SMonthType4_13 ?? 0);
row42[b] = Funs.GetNewDecimalOrZero(row42[b].ToString()).ToString("N2");
@@ -1296,7 +1296,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row43[4] = "安全电压照明系统";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row43[b] = payRegistrations.Sum(x => x.SMonthType4_14 ?? 0);
row43[b] = Funs.GetNewDecimalOrZero(row43[b].ToString()).ToString("N2");
@@ -1325,7 +1325,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row44[4] = "支护作业平台及防坠落、防滑设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row44[b] = payRegistrations.Sum(x => x.SMonthType4_15 ?? 0);
row44[b] = Funs.GetNewDecimalOrZero(row44[b].ToString()).ToString("N2");
@@ -1354,7 +1354,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row45[4] = "气瓶固定、防晒、防砸措施（气瓶笼或气瓶架）；气瓶检漏措施；防回火设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row45[b] = payRegistrations.Sum(x => x.SMonthType4_16 ?? 0);
row45[b] = Funs.GetNewDecimalOrZero(row45[b].ToString()).ToString("N2");
@@ -1383,7 +1383,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row46[4] = "高处动火的接火措施、挡火措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row46[b] = payRegistrations.Sum(x => x.SMonthType4_17 ?? 0);
row46[b] = Funs.GetNewDecimalOrZero(row46[b].ToString()).ToString("N2");
@@ -1412,7 +1412,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row47[4] = "火源及溅落区附件设备、电缆、管道、电气、仪表等覆盖保护措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row47[b] = payRegistrations.Sum(x => x.SMonthType4_18 ?? 0);
row47[b] = Funs.GetNewDecimalOrZero(row47[b].ToString()).ToString("N2");
@@ -1441,7 +1441,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row48[4] = "中小型机具安全附件维护，使用保护（安全锁钩、护套）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row48[b] = payRegistrations.Sum(x => x.SMonthType4_19 ?? 0);
row48[b] = Funs.GetNewDecimalOrZero(row48[b].ToString()).ToString("N2");
@@ -1470,7 +1470,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row49[4] = "塔吊、吊车、物料提升机、施工电梯等的各种防护装置和保险装置（如安全门、安全钩、限位器、限制器、安全制动器、安全监控器等）检查维护费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row49[b] = payRegistrations.Sum(x => x.SMonthType4_20 ?? 0);
row49[b] = Funs.GetNewDecimalOrZero(row49[b].ToString()).ToString("N2");
@@ -1499,7 +1499,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row50[4] = "机械设备、电器设备等传动部分为安全增设的安全防护装置及自动开关配置费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row50[b] = payRegistrations.Sum(x => x.SMonthType4_21 ?? 0);
row50[b] = Funs.GetNewDecimalOrZero(row50[b].ToString()).ToString("N2");
@@ -1528,7 +1528,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row51[4] = "锅炉、压力容器、压缩机及各种有爆炸危险的保险装置检查维护费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row51[b] = payRegistrations.Sum(x => x.SMonthType4_22 ?? 0);
row51[b] = Funs.GetNewDecimalOrZero(row51[b].ToString()).ToString("N2");
@@ -1557,7 +1557,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row52[4] = "为安全生产采取的信号装置、报警装置维护检查费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row52[b] = payRegistrations.Sum(x => x.SMonthType4_23 ?? 0);
row52[b] = Funs.GetNewDecimalOrZero(row52[b].ToString()).ToString("N2");
@@ -1586,7 +1586,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row53[4] = "现场拆封、检查、安装准备工作所需要脚手架平台";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row53[b] = payRegistrations.Sum(x => x.SMonthType4_24 ?? 0);
row53[b] = Funs.GetNewDecimalOrZero(row53[b].ToString()).ToString("N2");
@@ -1615,7 +1615,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row54[4] = "吸尘、降尘系统";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row54[b] = payRegistrations.Sum(x => x.SMonthType4_25 ?? 0);
row54[b] = Funs.GetNewDecimalOrZero(row54[b].ToString()).ToString("N2");
@@ -1644,7 +1644,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row55[4] = "封固、隔离、保护设施及临时平台、通道搭设";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row55[b] = payRegistrations.Sum(x => x.SMonthType4_26 ?? 0);
row55[b] = Funs.GetNewDecimalOrZero(row55[b].ToString()).ToString("N2");
@@ -1673,7 +1673,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row56[4] = "动土作业时的人工探挖、探查等措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row56[b] = payRegistrations.Sum(x => x.SMonthType4_27 ?? 0);
row56[b] = Funs.GetNewDecimalOrZero(row56[b].ToString()).ToString("N2");
@@ -1702,7 +1702,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row57[4] = "车辆阻火器和施工机具、临时用电设备、照明设备、锤击工具防爆设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row57[b] = payRegistrations.Sum(x => x.SMonthType4_28 ?? 0);
row57[b] = Funs.GetNewDecimalOrZero(row57[b].ToString()).ToString("N2");
@@ -1731,7 +1731,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row58[4] = "地沟、阀门井、排污井等封闭、冲洗";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row58[b] = payRegistrations.Sum(x => x.SMonthType4_29 ?? 0);
row58[b] = Funs.GetNewDecimalOrZero(row58[b].ToString()).ToString("N2");
@@ -1760,7 +1760,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row59[4] = "施工区域与生产的空间隔离和系统隔离及警戒措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row59[b] = payRegistrations.Sum(x => x.SMonthType4_30 ?? 0);
row59[b] = Funs.GetNewDecimalOrZero(row59[b].ToString()).ToString("N2");
@@ -1789,7 +1789,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row60[4] = "清污、限污所用器材专用安全防护器材和隔离设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row60[b] = payRegistrations.Sum(x => x.SMonthType4_31 ?? 0);
row60[b] = Funs.GetNewDecimalOrZero(row60[b].ToString()).ToString("N2");
@@ -1818,7 +1818,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row61[4] = "消音及噪声隔离设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row61[b] = payRegistrations.Sum(x => x.SMonthType4_32 ?? 0);
row61[b] = Funs.GetNewDecimalOrZero(row61[b].ToString()).ToString("N2");
@@ -1847,7 +1847,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row62[4] = "特种作业防护服，绝缘鞋，酸碱，绝缘手套，焊工面罩，鞋盖，护膝，护袖，披肩，各种专用防护眼镜，面罩，绝缘靴，自主呼吸器，防毒面具等，安全帽、安全带等";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row62[b] = payRegistrations.Sum(x => x.SMonthType4_33 ?? 0);
row62[b] = Funs.GetNewDecimalOrZero(row62[b].ToString()).ToString("N2");
@@ -1876,7 +1876,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row63[4] = "灭火器、灭火器箱、水带、消防池、消防铲、消防桶、太平斧、消防器材架等";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row63[b] = payRegistrations.Sum(x => x.SMonthType4_34 ?? 0);
row63[b] = Funs.GetNewDecimalOrZero(row63[b].ToString()).ToString("N2");
@@ -1905,7 +1905,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row64[4] = "防火毯、防火布、接火盆、挡火板、挡风用三防布、临时消防水管安装、拆除";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row64[b] = payRegistrations.Sum(x => x.SMonthType4_35 ?? 0);
row64[b] = Funs.GetNewDecimalOrZero(row64[b].ToString()).ToString("N2");
@@ -1934,7 +1934,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row65[4] = "应急器材及演练器材动用费用、消耗费用和工时损失费用等";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row65[b] = payRegistrations.Sum(x => x.SMonthType4_36 ?? 0);
row65[b] = Funs.GetNewDecimalOrZero(row65[b].ToString()).ToString("N2");
@@ -1963,7 +1963,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row66[4] = "应急淋浴和洗眼器、酸碱灼伤专用药品等现场医务室应急器材和消防、救护车辆";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row66[b] = payRegistrations.Sum(x => x.SMonthType4_37 ?? 0);
row66[b] = Funs.GetNewDecimalOrZero(row66[b].ToString()).ToString("N2");
@@ -1992,7 +1992,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row67[4] = "风雨季、沙尘暴、雷击、地质灾害、大水体防护和防洪特殊环境及临时处置费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row67[b] = payRegistrations.Sum(x => x.SMonthType4_38 ?? 0);
row67[b] = Funs.GetNewDecimalOrZero(row67[b].ToString()).ToString("N2");
@@ -2021,7 +2021,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row68[4] = "雨季、台风、沙尘暴等恶劣天气下，加固临时设施、大型施工机具等费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row68[b] = payRegistrations.Sum(x => x.SMonthType4_39 ?? 0);
row68[b] = Funs.GetNewDecimalOrZero(row68[b].ToString()).ToString("N2");
@@ -2050,7 +2050,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row69[4] = "其他";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row69[b] = payRegistrations.Sum(x => x.SMonthType4_40 ?? 0);
row69[b] = Funs.GetNewDecimalOrZero(row69[b].ToString()).ToString("N2");
@@ -2079,7 +2079,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row70[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row70[b] = payRegistrations.Sum(x => x.SMonthType4_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_6 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_7 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_8 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_9 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_10 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_11 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_12 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_13 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_14 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_15 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_16 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_17 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_18 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_19 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_20 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_21 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_22 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_23 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_24 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_25 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_26 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_27 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_28 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_29 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_30 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_31 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_32 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_33 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_34 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_35 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_36 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_37 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_38 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_39 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_40 ?? 0);
row70[b] = Funs.GetNewDecimalOrZero(row70[b].ToString()).ToString("N2");
@@ -2110,7 +2110,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row71[4] = "装置区域封闭用围挡";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row71[b] = payRegistrations.Sum(x => x.SMonthType5_1 ?? 0);
row71[b] = Funs.GetNewDecimalOrZero(row71[b].ToString()).ToString("N2");
@@ -2139,7 +2139,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row72[4] = "防爆电箱、防爆插头插座、防爆灯具、防爆施工机具器具";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row72[b] = payRegistrations.Sum(x => x.SMonthType5_2 ?? 0);
row72[b] = Funs.GetNewDecimalOrZero(row72[b].ToString()).ToString("N2");
@@ -2168,7 +2168,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row73[4] = "盲板管理用货架、专用锁具、专用标签与警示标志";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row73[b] = payRegistrations.Sum(x => x.SMonthType5_3 ?? 0);
row73[b] = Funs.GetNewDecimalOrZero(row73[b].ToString()).ToString("N2");
@@ -2197,7 +2197,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row74[4] = "专区封闭管理措施费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row74[b] = payRegistrations.Sum(x => x.SMonthType5_4 ?? 0);
row74[b] = Funs.GetNewDecimalOrZero(row74[b].ToString()).ToString("N2");
@@ -2226,7 +2226,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row75[4] = "防毒、放辐射措施和加氢点警戒、监护";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row75[b] = payRegistrations.Sum(x => x.SMonthType5_5 ?? 0);
row75[b] = Funs.GetNewDecimalOrZero(row75[b].ToString()).ToString("N2");
@@ -2255,7 +2255,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row76[4] = "其他专项措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row76[b] = payRegistrations.Sum(x => x.SMonthType5_6 ?? 0);
row76[b] = Funs.GetNewDecimalOrZero(row76[b].ToString()).ToString("N2");
@@ -2285,7 +2285,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row77[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row77[b] = payRegistrations.Sum(x => x.SMonthType5_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_6 ?? 0);
row77[b] = Funs.GetNewDecimalOrZero(row77[b].ToString()).ToString("N2");
@@ -2316,7 +2316,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row78[4] = "安全教育培训工时占用费（入场教育、专项培训、违章停工教育）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row78[b] = payRegistrations.Sum(x => x.SMonthType6_1 ?? 0);
row78[b] = Funs.GetNewDecimalOrZero(row78[b].ToString()).ToString("N2");
@@ -2345,7 +2345,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row79[4] = "师资费用";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row79[b] = payRegistrations.Sum(x => x.SMonthType6_2 ?? 0);
row79[b] = Funs.GetNewDecimalOrZero(row79[b].ToString()).ToString("N2");
@@ -2374,7 +2374,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row80[4] = "安全培训教育器材、教材";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row80[b] = payRegistrations.Sum(x => x.SMonthType6_3 ?? 0);
row80[b] = Funs.GetNewDecimalOrZero(row80[b].ToString()).ToString("N2");
@@ -2403,7 +2403,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row81[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row81[b] = payRegistrations.Sum(x => x.SMonthType6_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType6_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType6_3 ?? 0);
row81[b] = Funs.GetNewDecimalOrZero(row81[b].ToString()).ToString("N2");
@@ -2434,7 +2434,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row82[4] = "减震与降低噪音设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row82[b] = payRegistrations.Sum(x => x.TMonthType1_1 ?? 0);
row82[b] = Funs.GetNewDecimalOrZero(row82[b].ToString()).ToString("N2");
@@ -2463,7 +2463,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row83[4] = "射线防护的设施、措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row83[b] = payRegistrations.Sum(x => x.TMonthType1_2 ?? 0);
row83[b] = Funs.GetNewDecimalOrZero(row83[b].ToString()).ToString("N2");
@@ -2492,7 +2492,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row84[4] = "声、光、尘、有害物质防逸散控制措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row84[b] = payRegistrations.Sum(x => x.TMonthType1_3 ?? 0);
row84[b] = Funs.GetNewDecimalOrZero(row84[b].ToString()).ToString("N2");
@@ -2521,7 +2521,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row85[4] = "现场出入口和特定场所车辆、器材、人员清洗盥洗设施或设备";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row85[b] = payRegistrations.Sum(x => x.TMonthType1_4 ?? 0);
row85[b] = Funs.GetNewDecimalOrZero(row85[b].ToString()).ToString("N2");
@@ -2550,7 +2550,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row86[4] = "土方覆盖遮挡与洒水及其他施工扬尘控制设施设备";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row86[b] = payRegistrations.Sum(x => x.TMonthType1_5 ?? 0);
row86[b] = Funs.GetNewDecimalOrZero(row86[b].ToString()).ToString("N2");
@@ -2579,7 +2579,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row87[4] = "运输车辆及输送装置封闭或覆盖设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row87[b] = payRegistrations.Sum(x => x.TMonthType1_6 ?? 0);
row87[b] = Funs.GetNewDecimalOrZero(row87[b].ToString()).ToString("N2");
@@ -2608,7 +2608,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row88[4] = "消纳施工污水的设施、措施（沟渠、槽池、管线、机泵及附属临建）";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row88[b] = payRegistrations.Sum(x => x.TMonthType1_7 ?? 0);
row88[b] = Funs.GetNewDecimalOrZero(row88[b].ToString()).ToString("N2");
@@ -2637,7 +2637,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row89[4] = "易燃易爆、有毒有害、高腐蚀物质的使用保管、运输、回收过程中的安全防护设施和措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row89[b] = payRegistrations.Sum(x => x.TMonthType1_8 ?? 0);
row89[b] = Funs.GetNewDecimalOrZero(row89[b].ToString()).ToString("N2");
@@ -2666,7 +2666,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row90[4] = "现场毒害物质使用、消纳及意外应急相关设施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row90[b] = payRegistrations.Sum(x => x.TMonthType1_9 ?? 0);
row90[b] = Funs.GetNewDecimalOrZero(row90[b].ToString()).ToString("N2");
@@ -2695,7 +2695,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row91[4] = "危险物质特性说明书展示牌";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row91[b] = payRegistrations.Sum(x => x.TMonthType1_10 ?? 0);
row91[b] = Funs.GetNewDecimalOrZero(row91[b].ToString()).ToString("N2");
@@ -2724,7 +2724,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row92[4] = "施工废弃物、生活垃圾分类存放和消纳的设施、措施";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row92[b] = payRegistrations.Sum(x => x.TMonthType1_11 ?? 0);
row92[b] = Funs.GetNewDecimalOrZero(row92[b].ToString()).ToString("N2");
@@ -2753,7 +2753,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row93[4] = "费用小计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row93[b] = payRegistrations.Sum(x => x.TMonthType1_1 ?? 0) + payRegistrations.Sum(x => x.TMonthType1_2 ?? 0)
+ payRegistrations.Sum(x => x.TMonthType1_3 ?? 0) + payRegistrations.Sum(x => x.TMonthType1_4 ?? 0)
@@ -2794,7 +2794,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
row94[4] = "费用累计：";
for (int i = 0; i < units.Count; i++)
{
if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司
if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司
{
row94[b] = payRegistrations.Sum(x => x.SMonthType1_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_6 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_7 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_8 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_9 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_10 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_11 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_12 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_13 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_14 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_15 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_16 ?? 0)
+ payRegistrations.Sum(x => x.SMonthType2_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_4 ?? 0)
SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs
+2 -2
View File
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
if (!IsPostBack)
{
this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.lbTestType.Text = "培训试题";
this.TestRecordId = Request.Params["TestRecordId"];
this.Type = Request.Params["Type"];
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
personInfo += "项目：" + ProjectService.GetProjectNameByProjectId(testRecord.ProjectId) + " ";
}
else if (testRecord.UnitId == Const.UnitId_TCC)
else if (testRecord.UnitId == Const.UnitId_XJYJ)
{
personInfo += "部门：" + DepartService.getDepartNameById(testRecord.DepartId) + " ";
}
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
+1 -1
View File
@@ -54,7 +54,7 @@ namespace FineUIPro.Web.HSSE.Hazard
}
}
}
else if (user.UnitId == Const.UnitId_TCC || user.UserId == Const.hfnbdId)
else if (user.UnitId == Const.UnitId_XJYJ || user.UserId == Const.hfnbdId)
{
var ids = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).Select(x => x.UnitId).Distinct().ToList();
units = (from x in Funs.DB.Base_Unit
SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs
+1 -1
View File
@@ -337,7 +337,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
Model.InformationProject_AccidentCauseReport accidentCauseReport = new Model.InformationProject_AccidentCauseReport
{
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,
AccidentCauseReportCode = txtAccidentCauseReportCode.Text.Trim()
};
if (this.drpYear.SelectedValue != BLL.Const._Null)
SGGL/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReportEdit.aspx.cs
+1 -1
View File
@@ -318,7 +318,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
Model.InformationProject_DrillConductedQuarterlyReport drillConductedQuarterlyReport = new Model.InformationProject_DrillConductedQuarterlyReport
{
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/HSSE/InformationProject/DrillPlanHalfYearReportEdit.aspx.cs
+1 -1
View File
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
Model.InformationProject_DrillPlanHalfYearReport drillPlanHalfYearReport = new Model.InformationProject_DrillPlanHalfYearReport
{
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/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs
+2 -2
View File
@@ -499,7 +499,7 @@ namespace FineUIPro.Web.InformationProject
if (unit != null)
{
int count = BLL.SitePerson_DayReportService.GetDayReportsByCompileDateAndUnitId(startTime, endTime, this.CurrUser.LoginProjectId, unitId).Count();
if (unit.UnitId == Const.UnitId_TCC) //本单位
if (unit.UnitId == Const.UnitId_XJYJ) //本单位
{
//本单位在岗员工
decimal personNum = (from x in dayReports
@@ -594,7 +594,7 @@ namespace FineUIPro.Web.InformationProject
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(unitId);
if (unit != null)
{
if (unit.UnitId == Const.UnitId_TCC) //本单位
if (unit.UnitId == Const.UnitId_XJYJ) //本单位
{
//本单位在岗员工
decimal? personNum = db.SitePerson_MonthReportDetail.Where(x => x.MonthReportId == monthReport.MonthReportId && x.UnitId == unitId).Sum(x => x.RealPersonNum);
SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs
+1 -1
View File
@@ -389,7 +389,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
Model.InformationProject_SafetyQuarterlyReport safetyQuarterlyReport = new Model.InformationProject_SafetyQuarterlyReport
{
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/HSSE/InformationProject/WorkSummaryReportEdit.aspx.cs
+1 -1
View File
@@ -144,7 +144,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
Model.InformationProject_WorkSummaryReport report = new Model.InformationProject_WorkSummaryReport
{
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/HSSE/Law/HSSEStandardListSave.aspx.cs
+1 -1
View File
@@ -170,7 +170,7 @@ namespace FineUIPro.Web.HSSE.Law
{
hSSEStandardsList.IsPass = true;
hSSEStandardsList.CompileMan = this.CurrUser.UserName;
hSSEStandardsList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
hSSEStandardsList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
hSSEStandardsList.CompileDate = System.DateTime.Now;
this.StandardId = SQLHelper.GetNewID(typeof(Model.Law_HSSEStandardsList));
hSSEStandardsList.StandardId = this.StandardId;
SGGL/FineUIPro.Web/HSSE/Law/LawRegulationListEdit.aspx.cs
+1 -1
View File
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.HSSE.Law
lawRegulationList.IsPass = true;
lawRegulationList.CompileMan = this.CurrUser.UserName;
lawRegulationList.CompileDate = System.DateTime.Now;
lawRegulationList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
lawRegulationList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
this.LawRegulationId = SQLHelper.GetNewID(typeof(Model.Law_LawRegulationList));
lawRegulationList.LawRegulationId = this.LawRegulationId;
BLL.LawRegulationListService.AddLawRegulationList(lawRegulationList);
SGGL/FineUIPro.Web/HSSE/Law/ManageRuleEdit.aspx.cs
+1 -1
View File
@@ -132,7 +132,7 @@ namespace FineUIPro.Web.Law
manageRule.VersionNo = this.txtVersionNo.Text.Trim();
manageRule.AttachUrl = this.FullAttachUrl;
manageRule.Remark = this.txtRemark.Text.Trim();
manageRule.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
manageRule.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
manageRule.SeeFile = HttpUtility.HtmlEncode(this.txtSeeFile.Text);
if (string.IsNullOrEmpty(this.ManageRuleId))
{
SGGL/FineUIPro.Web/HSSE/Law/RulesRegulationsEdit.aspx.cs
+1 -1
View File
@@ -119,7 +119,7 @@ namespace FineUIPro.Web.HSSE.Law
rulesRegulations.IsPass = true;
rulesRegulations.CompileMan = this.CurrUser.UserName;
rulesRegulations.CompileDate = System.DateTime.Now;
rulesRegulations.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
rulesRegulations.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
this.RulesRegulationsId = SQLHelper.GetNewID();
rulesRegulations.RulesRegulationsId = this.RulesRegulationsId;
BLL.RulesRegulationsService.AddRulesRegulations(rulesRegulations);
SGGL/FineUIPro.Web/HSSE/License/ApplyView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.LicenseApplyId = Request.Params["LicenseApplyId"];
if (!string.IsNullOrEmpty(this.LicenseApplyId))
SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.BreakGroundId = Request.Params["BreakGroundId"];
if (!string.IsNullOrEmpty(this.BreakGroundId))
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.FireWorkId = Request.Params["FireWorkId"];
if (!string.IsNullOrEmpty(this.FireWorkId))
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs
+1 -1
View File
@@ -109,7 +109,7 @@ namespace FineUIPro.Web.HSSE.License
UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
//var pUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId);
if (this.CurrUser.UnitId != Const.UnitId_TCC)
if (this.CurrUser.UnitId != Const.UnitId_XJYJ)
{
this.drpUnitId.Enabled = false;
}
SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.HeightWorkId = Request.Params["HeightWorkId"];
if (!string.IsNullOrEmpty(this.HeightWorkId))
SGGL/FineUIPro.Web/HSSE/License/JiaBanView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.JiaBanId = Request.Params["JiaBanId"];
if (!string.IsNullOrEmpty(this.JiaBanId))
SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.LiftingWorkId = Request.Params["LiftingWorkId"];
if (!string.IsNullOrEmpty(this.LiftingWorkId))
SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.LimitedSpaceId = Request.Params["LimitedSpaceId"];
if (!string.IsNullOrEmpty(this.LimitedSpaceId))
SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@
{
if (!IsPostBack)
{
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title;
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.NightWorkId = Request.Params["NightWorkId"];
if (!string.IsNullOrEmpty(this.NightWorkId))

Some files were not shown because too many files have changed in this diff Show More