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/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))
SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.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.OpenCircuitId = Request.Params["OpenCircuitId"];
if (!string.IsNullOrEmpty(this.OpenCircuitId))
SGGL/FineUIPro.Web/HSSE/License/PressureTestView.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.PressureTestId = Request.Params["PressureTestId"];
if (!string.IsNullOrEmpty(this.PressureTestId))
SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.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.RadialWorkId = Request.Params["RadialWorkId"];
if (!string.IsNullOrEmpty(this.RadialWorkId))
SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.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.TempElectricityId = Request.Params["TempElectricityId"];
if (!string.IsNullOrEmpty(this.TempElectricityId))
SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthEdit.aspx.cs
+1 -1
View File
@@ -48,7 +48,7 @@ namespace FineUIPro.Web.HSSE.Manager
{
if (!IsPostBack)
{
var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
if (unit != null && !string.IsNullOrEmpty(unit.UnitCode))
{
string url = "../Images/SUBimages/" + unit.UnitCode + ".gif";
SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs
+1 -1
View File
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.HSSE.Manager
{
if (!IsPostBack)
{
var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC);
var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ);
if (unit != null && !string.IsNullOrEmpty(unit.UnitCode))
{
string url = "../Images/SUBimages/" + unit.UnitCode + ".gif";
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
+4 -4
View File
@@ -79,10 +79,10 @@ namespace FineUIPro.Web.HSSE.Manager
{
MonthReportId = Request.Params["MonthReportId"];
}
BLL.UserService.InitFlowOperateControlUserDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, false);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, false);
this.CompileManId.SelectedValue = this.CurrUser.UserId;
BLL.UserService.InitFlowOperateControlUserDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, false);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, false);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, false);
BLL.UserService.InitFlowOperateControlUserDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, false);
string montvalues = ReporMonth.Text;
var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == this.MonthReportId);
if (getMont != null)
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.drpStep.DataSource = BLL.DropListService.GetMonthReportStepList(this.States);
this.drpStep.DataBind();
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);
if (this.States == Const.State_0 || string.IsNullOrEmpty(this.States)) ///待提交
{
this.txtOpinion.Hidden = true;
SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQualityEdit.aspx.cs
+2 -2
View File
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
var EquipmentPersonQuality = BLL.EquipmentPersonQualityService.GetEquipmentPersonQualityByPersonId(this.PersonId);
if (EquipmentPersonQuality != null)
{
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
this.EquipmentPersonQualityId = EquipmentPersonQuality.EquipmentPersonQualityId;
this.txtCertificateNo.Text = EquipmentPersonQuality.CertificateNo;
this.drpCertificate.SelectedValue = EquipmentPersonQuality.CertificateId;
@@ -110,7 +110,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
}
if (Request.Params["value"] == "0")
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
+2 -2
View File
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(this.PersonId);
if (personQuality != null)
{
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
this.PersonQualityId = personQuality.PersonQualityId;
this.txtCertificateNo.Text = personQuality.CertificateNo;
this.drpCertificate.SelectedValue = personQuality.CertificateId;
@@ -110,7 +110,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
}
if (Request.Params["value"] == "0")
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs
+2 -2
View File
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
var SafePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(this.PersonId);
if (SafePersonQuality != null)
{
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
this.SafePersonQualityId = SafePersonQuality.SafePersonQualityId;
this.txtCertificateNo.Text = SafePersonQuality.CertificateNo;
this.txtCertificateName.Text = SafePersonQuality.CertificateName;
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
}
else
{
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx
+17 -2
View File
@@ -106,8 +106,20 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="PositionName" DataField="PositionName" FieldType="String"
HeaderText="所属职务" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField Width="90px" ColumnID="InstitutionalDivisionName" DataField="InstitutionalDivisionName" FieldType="String"
HeaderText="机构划分" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="DepartName" DataField="DepartName" FieldType="String"
HeaderText="组织单元" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="EmployeeCategoryName" DataField="EmployeeCategoryName" FieldType="String"
HeaderText="人员分类" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="WorkAreaName" DataField="WorkAreaName" FieldType="String"
HeaderText="人员分类" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="EmployeeSubgroupName" DataField="EmployeeSubgroupName" FieldType="String"
HeaderText="员工子组" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="PostTitleName" DataField="PostTitleName" FieldType="String"
HeaderText="所属职称" HeaderTextAlign="Center" TextAlign="Center">
@@ -182,6 +194,9 @@
<f:RenderField Width="90px" ColumnID="IsCardUsedName" DataField="IsCardUsedName"
FieldType="String" HeaderText="考勤卡启用" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
+236 -133
View File
@@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.SysManage;
using System;
using System.Collections.Generic;
using System.Data;
@@ -155,7 +156,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 38);
AddDatasetToSQL(ds.Tables[0], 43);
}
catch (Exception ex)
{
@@ -201,6 +202,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
select x;
var positions = from x in Funs.DB.Base_Position select x;
var postTitles = from x in Funs.DB.Base_PostTitle select x;
var institutionalDivisions = from x in Funs.DB.Base_InstitutionalDivision select x;
var departs = from x in Funs.DB.Base_Depart select x;
var employeeCategorys = from x in Funs.DB.Base_EmployeeCategory select x;
var employeeSubgroups = from x in Funs.DB.Base_EmployeeSubgroup select x;
for (int i = 0; i < ir; i++)
{
string col1 = pds.Rows[i][1].ToString().Trim();
@@ -394,97 +399,137 @@ namespace FineUIPro.Web.HSSE.SitePerson
string col14 = pds.Rows[i][14].ToString().Trim();
if (!string.IsNullOrEmpty(col14))
{
var position = positions.FirstOrDefault(e => e.PositionName == col14);
if (position == null)
var institutionalDivision = institutionalDivisions.FirstOrDefault(e => e.Name == col14);
if (institutionalDivision == null)
{
result += "第" + (i + 2).ToString() + "行," + "所属职务" + "," + "[" + col14 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "机构划分" + "," + "[" + col14 + "]错误！" + "|";
}
}
string col15 = pds.Rows[i][15].ToString().Trim();
if (!string.IsNullOrEmpty(col15))
{
var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col15);
if (postTitle == null)
var depart = departs.FirstOrDefault(e => e.DepartName == col15);
if (depart == null)
{
result += "第" + (i + 2).ToString() + "行," + "所属职称" + "," + "[" + col15 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "组织单元" + "," + "[" + col15 + "]错误！" + "|";
}
}
string col16 = pds.Rows[i][16].ToString().Trim();
if (!string.IsNullOrEmpty(col16))
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col16);
if (basicData == null)
var employeeCategory = employeeCategorys.FirstOrDefault(e => e.CategoryName == col16);
if (employeeCategory == null)
{
result += "第" + (i + 2).ToString() + "行," + "文化程度" + "," + "[" + col16 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "人员分类" + "," + "[" + col16 + "]错误！" + "|";
}
}
string col17 = pds.Rows[i][17].ToString().Trim();
if (!string.IsNullOrEmpty(col17))
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col17);
if (basicData == null)
var employeeSubgroup = employeeSubgroups.FirstOrDefault(e => e.SubgroupName == col17);
if (employeeSubgroup == null)
{
result += "第" + (i + 2).ToString() + "行," + "婚姻状况" + "," + "[" + col17 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "员工子组" + "," + "[" + col17 + "]错误！" + "|";
}
}
string col18 = pds.Rows[i][18].ToString().Trim();
if (!string.IsNullOrEmpty(col18))
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col18);
if (basicData == null)
var position = positions.FirstOrDefault(e => e.PositionName == col18);
if (position == null)
{
result += "第" + (i + 2).ToString() + "行," + "政治面貌" + "," + "[" + col18 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "所属职务" + "," + "[" + col18 + "]错误！" + "|";
}
}
string col19 = pds.Rows[i][19].ToString().Trim();
if (!string.IsNullOrEmpty(col19))
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col19);
if (basicData == null)
var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col19);
if (postTitle == null)
{
result += "第" + (i + 2).ToString() + "行," + "民族" + "," + "[" + col19 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "所属职称" + "," + "[" + col19 + "]错误！" + "|";
}
}
string col20 = pds.Rows[i][20].ToString().Trim();
if (!string.IsNullOrEmpty(col20))
{
var country = countrys.FirstOrDefault(e => e.Cname == col20);
if (country == null)
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col20);
if (basicData == null)
{
result += "第" + (i + 2).ToString() + "行," + "国家" + "," + "[" + col20 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "文化程度" + "," + "[" + col20 + "]错误！" + "|";
}
}
string col21 = pds.Rows[i][21].ToString().Trim();
if (!string.IsNullOrEmpty(col21))
{
var city = citys.FirstOrDefault(e => e.Cname == col21);
if (city == null)
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col21);
if (basicData == null)
{
result += "第" + (i + 2).ToString() + "行," + "省或地区" + "," + "[" + col21 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "婚姻状况" + "," + "[" + col21 + "]错误！" + "|";
}
}
string col22 = pds.Rows[i][22].ToString().Trim();
if (!string.IsNullOrEmpty(col22))
{
var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col22);
if (cnProfessional == null)
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col22);
if (basicData == null)
{
result += "第" + (i + 2).ToString() + "行," + "主专业" + "," + "[" + col22 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "政治面貌" + "," + "[" + col22 + "]错误！" + "|";
}
}
string col23 = pds.Rows[i][23].ToString().Trim();
if (!string.IsNullOrEmpty(col23))
{
string[] strs = col23.Split('，');
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col23);
if (basicData == null)
{
result += "第" + (i + 2).ToString() + "行," + "民族" + "," + "[" + col23 + "]错误！" + "|";
}
}
string col24 = pds.Rows[i][24].ToString().Trim();
if (!string.IsNullOrEmpty(col24))
{
var country = countrys.FirstOrDefault(e => e.Cname == col24);
if (country == null)
{
result += "第" + (i + 2).ToString() + "行," + "国家" + "," + "[" + col24 + "]错误！" + "|";
}
}
string col25 = pds.Rows[i][25].ToString().Trim();
if (!string.IsNullOrEmpty(col25))
{
var city = citys.FirstOrDefault(e => e.Cname == col25);
if (city == null)
{
result += "第" + (i + 2).ToString() + "行," + "省或地区" + "," + "[" + col25 + "]错误！" + "|";
}
}
string col26 = pds.Rows[i][26].ToString().Trim();
if (!string.IsNullOrEmpty(col26))
{
var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col26);
if (cnProfessional == null)
{
result += "第" + (i + 2).ToString() + "行," + "主专业" + "," + "[" + col26 + "]错误！" + "|";
}
}
string col27 = pds.Rows[i][27].ToString().Trim();
if (!string.IsNullOrEmpty(col27))
{
string[] strs = col27.Split('，');
foreach (var item in strs)
{
var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == item);
@@ -495,54 +540,28 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
}
string col24 = pds.Rows[i][24].ToString().Trim();
if (!string.IsNullOrEmpty(col24))
{
var certificate = certificates.FirstOrDefault(e => e.CertificateName == col24);
if (certificate == null)
{
result += "第" + (i + 2).ToString() + "行," + "特岗证书" + "," + "[" + col24 + "]错误！" + "|";
}
}
string col27 = pds.Rows[i][27].ToString().Trim();
if (!string.IsNullOrEmpty(col27))
{
try
{
DateTime date = Convert.ToDateTime(col27);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "发证日期" + "," + "[" + col27 + "]错误！" + "|";
}
}
string col28 = pds.Rows[i][28].ToString().Trim();
if (!string.IsNullOrEmpty(col28))
{
try
var certificate = certificates.FirstOrDefault(e => e.CertificateName == col28);
if (certificate == null)
{
DateTime date = Convert.ToDateTime(col28);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "证书有效期" + "," + "[" + col28 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "特岗证书" + "," + "[" + col28 + "]错误！" + "|";
}
}
string col29 = pds.Rows[i][29].ToString().Trim();
if (!string.IsNullOrEmpty(col29))
string col31 = pds.Rows[i][31].ToString().Trim();
if (!string.IsNullOrEmpty(col31))
{
try
{
DateTime date = Convert.ToDateTime(col29);
DateTime date = Convert.ToDateTime(col31);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col29 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "发证日期" + "," + "[" + col31 + "]错误！" + "|";
}
}
string col32 = pds.Rows[i][32].ToString().Trim();
if (!string.IsNullOrEmpty(col32))
{
@@ -552,34 +571,60 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "出场时间" + "," + "[" + col32 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "证书有效期" + "," + "[" + col32 + "]错误！" + "|";
}
}
string col34 = pds.Rows[i][34].ToString().Trim();
if (!string.IsNullOrEmpty(col34))
string col33 = pds.Rows[i][33].ToString().Trim();
if (!string.IsNullOrEmpty(col33))
{
if (col34 != "是" && col34 != "否")
try
{
result += "第" + (i + 2).ToString() + "行," + "外籍" + "," + "[" + col34 + "]错误！" + "|";
DateTime date = Convert.ToDateTime(col33);
}
}
string col35 = pds.Rows[i][35].ToString().Trim();
if (!string.IsNullOrEmpty(col35))
{
if (col35 != "是" && col35 != "否")
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "外聘" + "," + "[" + col35 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col33 + "]错误！" + "|";
}
}
string col36 = pds.Rows[i][36].ToString().Trim();
if (!string.IsNullOrEmpty(col36))
{
if (col36 != "是" && col36 != "否")
try
{
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "[" + col36 + "]错误！" + "|";
DateTime date = Convert.ToDateTime(col36);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "出场时间" + "," + "[" + col36 + "]错误！" + "|";
}
}
string col38 = pds.Rows[i][38].ToString().Trim();
if (!string.IsNullOrEmpty(col38))
{
if (col38 != "是" && col38 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "外籍" + "," + "[" + col38 + "]错误！" + "|";
}
}
string col39 = pds.Rows[i][39].ToString().Trim();
if (!string.IsNullOrEmpty(col39))
{
if (col39 != "是" && col39 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "外聘" + "," + "[" + col39 + "]错误！" + "|";
}
}
string col40 = pds.Rows[i][40].ToString().Trim();
if (!string.IsNullOrEmpty(col40))
{
if (col40 != "是" && col40 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "[" + col40 + "]错误！" + "|";
}
}
else
@@ -587,12 +632,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "此项为必填项！" + "|";
}
string col37 = pds.Rows[i][37].ToString().Trim();
if (!string.IsNullOrEmpty(col37))
string col41 = pds.Rows[i][41].ToString().Trim();
if (!string.IsNullOrEmpty(col41))
{
if (col37 != "是" && col37 != "否")
if (col41 != "是" && col41 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "考勤卡是否启用" + "," + "[" + col37 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "考勤卡是否启用" + "," + "[" + col41 + "]错误！" + "|";
}
}
//else
@@ -694,7 +739,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 38);
AddDatasetToSQL2(ds.Tables[0], 43);
}
catch (Exception ex)
{
@@ -741,6 +786,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
select x;
var positions = from x in Funs.DB.Base_Position select x;
var postTitles = from x in Funs.DB.Base_PostTitle select x;
var institutionalDivisions = from x in Funs.DB.Base_InstitutionalDivision select x;
var departs = from x in Funs.DB.Base_Depart select x;
var employeeCategorys = from x in Funs.DB.Base_EmployeeCategory select x;
var employeeSubgroups = from x in Funs.DB.Base_EmployeeSubgroup select x;
for (int i = 0; i < ir; i++)
{
string col1 = pds.Rows[i][1].ToString().Trim();
@@ -786,6 +835,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
string col35 = pds.Rows[i][35].ToString().Trim();
string col36 = pds.Rows[i][36].ToString().Trim();
string col37 = pds.Rows[i][37].ToString().Trim();
string col38 = pds.Rows[i][38].ToString().Trim();
string col39 = pds.Rows[i][39].ToString().Trim();
string col40 = pds.Rows[i][40].ToString().Trim();
string col41 = pds.Rows[i][41].ToString().Trim();
string col42 = pds.Rows[i][42].ToString().Trim();
if (!string.IsNullOrEmpty(col0))//卡号
{
@@ -878,92 +932,129 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.InTime = Funs.GetNewDateTime(col13);
}
if (!string.IsNullOrEmpty(col14))//所属职务
if (!string.IsNullOrEmpty(col14))//机构划分
{
var position = positions.FirstOrDefault(e => e.PositionName == col14);
var institutionalDivision = institutionalDivisions.FirstOrDefault(e => e.Name == col14);
if (institutionalDivision != null)
{
person.InstitutionalDivisionId = institutionalDivision.Id;
person.InstitutionalDivisionName = institutionalDivision.Name;
}
}
if (!string.IsNullOrEmpty(col15))//组织单元
{
var depart = departs.FirstOrDefault(e => e.DepartName == col15);
if (depart != null)
{
person.DepartId = depart.DepartId;
person.DepartName = depart.DepartName;
}
}
if (!string.IsNullOrEmpty(col16))//人员分类
{
var employeeCategory = employeeCategorys.FirstOrDefault(e => e.CategoryName == col16);
if (employeeCategory != null)
{
person.EmployeeCategoryId = employeeCategory.CategoryId;
person.EmployeeCategoryName = employeeCategory.CategoryName;
}
}
if (!string.IsNullOrEmpty(col17))//员工子组
{
var employeeSubgroup = employeeSubgroups.FirstOrDefault(e => e.SubgroupName == col17);
if (employeeSubgroup != null)
{
person.EmployeeSubgroupId = employeeSubgroup.SubgroupId;
person.EmployeeSubgroupName = employeeSubgroup.SubgroupName;
}
}
if (!string.IsNullOrEmpty(col18))//所属职务
{
var position = positions.FirstOrDefault(e => e.PositionName == col18);
if (position != null)
{
person.PositionId = position.PositionId;
person.PositionName = position.PositionName;
}
}
if (!string.IsNullOrEmpty(col15))//所属职称
if (!string.IsNullOrEmpty(col19))//所属职称
{
var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col15);
var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col19);
if (postTitle != null)
{
person.PostTitleId = postTitle.PostTitleId;
person.PostTitleName = postTitle.PostTitleName;
}
}
if (!string.IsNullOrEmpty(col16))//文化程度
if (!string.IsNullOrEmpty(col20))//文化程度
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col16);
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col20);
if (basicData != null)
{
person.EduLevel = basicData.DictCode;
person.EduLevelName = basicData.DictName;
}
}
if (!string.IsNullOrEmpty(col17))//婚姻状况
if (!string.IsNullOrEmpty(col21))//婚姻状况
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col17);
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col21);
if (basicData != null)
{
person.MaritalStatus = basicData.DictCode;
person.MaritalStatusName = basicData.DictName;
}
}
if (!string.IsNullOrEmpty(col18))//政治面貌
if (!string.IsNullOrEmpty(col22))//政治面貌
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col18);
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col22);
if (basicData != null)
{
person.PoliticsStatus = basicData.DictCode;
person.PoliticsStatusName = basicData.DictName;
}
}
if (!string.IsNullOrEmpty(col19))//民族
if (!string.IsNullOrEmpty(col23))//民族
{
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col19);
var basicData = basicDatas.FirstOrDefault(e => e.DictName == col23);
if (basicData != null)
{
person.Nation = basicData.DictCode;
person.NationName = basicData.DictName;
}
}
if (!string.IsNullOrEmpty(col20))//国家
if (!string.IsNullOrEmpty(col24))//国家
{
var country = countrys.FirstOrDefault(e => e.Cname == col20);
var country = countrys.FirstOrDefault(e => e.Cname == col24);
if (country != null)
{
person.CountryCode = country.CountryId;
person.CountryName = country.Cname;
}
}
if (!string.IsNullOrEmpty(col21))//省或地区
if (!string.IsNullOrEmpty(col25))//省或地区
{
var city = citys.FirstOrDefault(e => e.Cname == col21);
var city = citys.FirstOrDefault(e => e.Cname == col25);
if (city != null)
{
person.ProvinceCode = city.ProvinceCode;
person.ProvinceName = city.Cname;
}
}
if (!string.IsNullOrEmpty(col22))//主专业
if (!string.IsNullOrEmpty(col26))//主专业
{
var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col22);
var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col26);
if (cnProfessional != null)
{
person.MainCNProfessionalId = cnProfessional.CNProfessionalId;
person.MainCNProfessionalName = cnProfessional.ProfessionalName;
}
}
if (!string.IsNullOrEmpty(col23))//副专业
if (!string.IsNullOrEmpty(col27))//副专业
{
person.ViceCNProfessionalName = col23;
person.ViceCNProfessionalName = col27;
string ids = string.Empty;
string[] strs = col23.Split('，');
string[] strs = col27.Split('，');
foreach (var item in strs)
{
var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == item);
@@ -978,63 +1069,67 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
person.ViceCNProfessionalId = ids;
}
if (!string.IsNullOrEmpty(col24))//特岗证书
if (!string.IsNullOrEmpty(col28))//特岗证书
{
personQuality.CertificateName = col24;
personQuality.CertificateName = col28;
}
if (!string.IsNullOrEmpty(col25))//证书编号
if (!string.IsNullOrEmpty(col29))//证书编号
{
personQuality.CertificateNo = col25;
personQuality.CertificateNo = col29;
}
if (!string.IsNullOrEmpty(col26))//发证单位
if (!string.IsNullOrEmpty(col30))//发证单位
{
personQuality.SendUnit = col26;
personQuality.SendUnit = col30;
}
if (!string.IsNullOrEmpty(col27))//发证日期
if (!string.IsNullOrEmpty(col31))//发证日期
{
personQuality.SendDate = Funs.GetNewDateTime(col27);
personQuality.SendDate = Funs.GetNewDateTime(col31);
}
if (!string.IsNullOrEmpty(col28))//证书有效期
if (!string.IsNullOrEmpty(col32))//证书有效期
{
personQuality.LimitDate = Funs.GetNewDateTime(col28);
personQuality.LimitDate = Funs.GetNewDateTime(col32);
}
if (!string.IsNullOrEmpty(col29))//出生日期
if (!string.IsNullOrEmpty(col33))//出生日期
{
person.Birthday = Funs.GetNewDateTime(col29);
person.Birthday = Funs.GetNewDateTime(col33);
}
if (!string.IsNullOrEmpty(col30))//电话
if (!string.IsNullOrEmpty(col34))//电话
{
person.Telephone = col30;
person.Telephone = col34;
}
if (!string.IsNullOrEmpty(col31))//家庭地址
if (!string.IsNullOrEmpty(col35))//家庭地址
{
person.Address = col31;
person.Address = col35;
}
if (!string.IsNullOrEmpty(col32))//出场时间
if (!string.IsNullOrEmpty(col36))//出场时间
{
person.OutTime = Funs.GetNewDateTime(col32);
person.OutTime = Funs.GetNewDateTime(col36);
}
if (!string.IsNullOrEmpty(col33))//出场原因
if (!string.IsNullOrEmpty(col37))//出场原因
{
person.OutResult = col33;
person.OutResult = col37;
}
if (!string.IsNullOrEmpty(col34))//外籍
if (!string.IsNullOrEmpty(col38))//外籍
{
person.IsForeignStr = col34;
person.IsForeign = col34 == "是" ? true : false;
person.IsForeignStr = col38;
person.IsForeign = col38 == "是" ? true : false;
}
if (!string.IsNullOrEmpty(col35))//外聘
if (!string.IsNullOrEmpty(col39))//外聘
{
person.IsOutsideStr = col35;
person.IsOutside = col35 == "是" ? true : false;
person.IsOutsideStr = col39;
person.IsOutside = col39 == "是" ? true : false;
}
if (!string.IsNullOrEmpty(col36))//人员是否在场
if (!string.IsNullOrEmpty(col40))//人员是否在场
{
person.IsUsedName = col36;
person.IsUsedName = col40;
}
if (!string.IsNullOrEmpty(col37))//考勤卡是否启用
if (!string.IsNullOrEmpty(col41))//考勤卡是否启用
{
person.IsCardUsedName = col37;
person.IsCardUsedName = col41;
}
if (!string.IsNullOrEmpty(col42))//备注
{
person.Remarks = col42;
}
person.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
persons.Add(person);
@@ -1095,9 +1190,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
newPerson.WorkPostId = persons[i].WorkPostId;
newPerson.TeamGroupId = persons[i].TeamGroupId;
newPerson.WorkAreaId = persons[i].WorkAreaId;
newPerson.InTime = persons[i].InTime;
newPerson.InTime = persons[i].InTime;
newPerson.PositionId = persons[i].PositionId;
newPerson.PostTitleId = persons[i].PostTitleId;
newPerson.DepartId = persons[i].DepartId;
newPerson.EmployeeCategoryId = persons[i].EmployeeCategoryId;
newPerson.EmployeeSubgroupId = persons[i].EmployeeSubgroupId;
newPerson.InstitutionalDivisionId = persons[i].InstitutionalDivisionId;
newPerson.DepartName = persons[i].DepartName;
newPerson.EmployeeCategoryName = persons[i].EmployeeCategoryName;
newPerson.EmployeeSubgroupName = persons[i].EmployeeSubgroupName;
newPerson.InstitutionalDivisionName = persons[i].InstitutionalDivisionName;
newPerson.EduLevel = persons[i].EduLevel;
newPerson.MaritalStatus = persons[i].MaritalStatus;
newPerson.PoliticsStatus = persons[i].PoliticsStatus;
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
+48 -30
View File
@@ -1,7 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonListEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.SitePerson.PersonListEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>编辑人员信息</title>
@@ -74,15 +73,15 @@
<f:TextBox ID="txtIdentityCard" runat="server" Label="证件号码" MaxLength="50" LabelAlign="Right" LabelWidth="110px"
Required="true" ShowRedStar="true" OnBlur="txtIdentityCard_TextChanged" EnableBlurEvent="true">
</f:TextBox>
<f:DatePicker ID="txtIdcardStartDate" runat="server" Label="证件开始日期" LabelAlign="Right" LabelWidth="110px">
<f:DatePicker ID="txtIdcardStartDate" runat="server" Label="证件开始日期" LabelAlign="Right" LabelWidth="110px">
</f:DatePicker>
<f:DatePicker ID="txtIdcardEndDate" runat="server" Label="证件有效日期" LabelAlign="Right" LabelWidth="110px">
<f:DatePicker ID="txtIdcardEndDate" runat="server" Label="证件有效日期" LabelAlign="Right" LabelWidth="110px">
</f:DatePicker>
<%--<f:TextBox ID="txtUnitName" runat="server" Label="所属单位" LabelAlign="Right"
Readonly="true" LabelWidth="110px"></f:TextBox>--%>
<f:DropDownList ID="drpUnit" runat="server" Label="所属单位" LabelWidth="110px" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
</f:DropDownList>
<f:DropDownBox runat="server" Label="单位工程" ShowRedStar="true" LabelAlign="Right" LabelWidth="110px"
<f:DropDownBox runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="110px"
Required="true" ID="txtWorkArea" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="true">
<PopPanel>
<f:Grid ID="gvWorkArea" DataIDField="UnitWorkId"
@@ -96,11 +95,12 @@
</f:Grid>
</PopPanel>
</f:DropDownBox>
<f:DropDownList ID="drpInstitutionalDivision" runat="server" Label="机构划分" EnableEdit="true" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpDepart" runat="server" Label="组织单元" EnableEdit="true" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpMainCNProfessional" runat="server" Label="主专业" EnableEdit="true" LabelAlign="Right" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpAuditor" runat="server" Label="审核人" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:CheckBox runat="server" ID="ckIsForeign" Label="外籍" LabelAlign="Right" LabelWidth="110px"></f:CheckBox>
<f:DatePicker ID="txtBirthday" runat="server" Label="出生日期" LabelAlign="Right" LabelWidth="110px">
</f:DatePicker>
<f:DatePicker ID="txtInTime" runat="server" Label="入场时间" LabelAlign="Right" LabelWidth="110px" ShowRedStar="true" Required="true">
@@ -122,22 +122,22 @@
<f:RadioItem Value="2" Text="女" />
</f:RadioButtonList>
<f:RadioButtonList ID="rblIdcardForever" runat="server" Label="证件是否永久有效" LabelWidth="145px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="rblIdcardForever_SelectedIndexChanged">
<f:RadioItem Value="Y" Text="是" />
<f:RadioItem Value="N" Text="否" Selected="true"/>
<f:RadioItem Value="Y" Text="是" />
<f:RadioItem Value="N" Text="否" Selected="true" />
</f:RadioButtonList>
<f:TextBox ID="txtIdcardAddress" runat="server" Label="发证机关" MaxLength="50" LabelAlign="Right" >
<f:TextBox ID="txtIdcardAddress" runat="server" Label="发证机关" MaxLength="50" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpPost" runat="server" Label="所属岗位" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpTeamGroup" runat="server" Label="所属班组" LabelAlign="Right" ShowRedStar="true" Required="true">
</f:DropDownList>
<f:DropDownList ID="drpViceCNProfessional" runat="server" Label="副专业" EnableEdit="true" LabelAlign="Right"
<f:DropDownList ID="drpEmployeeCategory" runat="server" Label="人员分类" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpEmployeeSubgroup" runat="server" Label="员工子组" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpViceCNProfessional" runat="server" Label="副专业" EnableEdit="true" LabelAlign="Right"
EnableMultiSelect="true" MaxLength="500" EnableCheckBoxSelect="true">
</f:DropDownList>
<f:DatePicker ID="txtAuditorDate" runat="server" Label="审核时间" LabelAlign="Right" >
</f:DatePicker>
<f:CheckBox runat="server" ID="ckIsOutside" Label="外聘" LabelAlign="Right"></f:CheckBox>
<f:TextBox ID="txtTelephone" runat="server" Label="电话" LabelAlign="Right" MaxLength="50">
</f:TextBox>
<f:RadioButtonList ID="rblIsUsed" runat="server" Label="人员在场" LabelAlign="Right" Required="True" ShowRedStar="True">
@@ -146,7 +146,6 @@
</f:RadioButtonList>
<%--<f:DropDownList ID="drpRole" runat="server" Label="培训岗位" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
</f:DropDownList>--%>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="面板1" BoxFlex="2" runat="server" ShowBorder="false" ShowHeader="false"
@@ -171,25 +170,25 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPosition" runat="server" Label="所属职务" LabelAlign="Right" EnableEdit="true" >
<f:DropDownList ID="drpPosition" runat="server" Label="所属职务" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpTitle" runat="server" Label="所属职称" LabelAlign="Right" EnableEdit="true" >
<f:DropDownList ID="drpTitle" runat="server" Label="所属职称" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpEduLevel" runat="server" Label="文化程度" EnableEdit="true" LabelAlign="Right" >
<f:DropDownList ID="drpEduLevel" runat="server" Label="文化程度" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpMaritalStatus" runat="server" Label="婚姻状况" EnableEdit="true" LabelAlign="Right" >
<f:DropDownList ID="drpMaritalStatus" runat="server" Label="婚姻状况" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPoliticsStatus" runat="server" Label="政治面貌" EnableEdit="true" LabelAlign="Right" >
<f:DropDownList ID="drpPoliticsStatus" runat="server" Label="政治面貌" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpNation" runat="server" Label="民族" EnableEdit="true" LabelAlign="Right" >
<f:DropDownList ID="drpNation" runat="server" Label="民族" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
</Items>
</f:FormRow>
@@ -197,13 +196,13 @@
<Items>
<f:DropDownList ID="drpCountryCode" runat="server" Label="国家" EnableEdit="true" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpCountryCode_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpProvinceCode" runat="server" Label="省或地区" EnableEdit="true" LabelAlign="Right" >
<f:DropDownList ID="drpProvinceCode" runat="server" Label="省或地区" EnableEdit="true" LabelAlign="Right">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtCertificateCode" runat="server" Label="证书编号" LabelAlign="Right" MaxLength="20">
</f:TextBox>
@@ -211,9 +210,9 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtCertificateLimitTime" runat="server" Label="证书有效期" LabelAlign="Right" >
<f:DatePicker ID="txtCertificateLimitTime" runat="server" Label="证书有效期" LabelAlign="Right">
</f:DatePicker>
<f:RadioButtonList ID="rblIsCardUsed" runat="server" Label="考勤卡启用"
<f:RadioButtonList ID="rblIsCardUsed" runat="server" Label="考勤卡启用"
LabelAlign="Right" Required="True">
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Text="否" />
@@ -222,11 +221,25 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right" >
</f:TextBox>
<f:DatePicker ID="txtOutTime" runat="server" Label="出场时间" LabelAlign="Right">
<f:DropDownList ID="drpAuditor" runat="server" Label="审核人" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="txtAuditorDate" runat="server" Label="审核时间" LabelAlign="Right">
</f:DatePicker>
</Items>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckIsForeign" Label="外籍" LabelAlign="Right"></f:CheckBox>
<f:CheckBox runat="server" ID="ckIsOutside" Label="外聘" LabelAlign="Right"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right">
</f:TextBox>
<f:DatePicker ID="txtOutTime" runat="server" Label="出场时间" LabelAlign="Right">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="100%">
<Items>
@@ -234,6 +247,11 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="100%">
<Items>
<f:TextArea ID="txtRemarks" runat="server" Label="备注" LabelAlign="Right" MaxLength="500" Height="100px"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+39 -1
View File
@@ -137,6 +137,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
this.drpMainCNProfessional.SelectedValue = person.MainCNProfessionalId;
}
if (!string.IsNullOrEmpty(person.InstitutionalDivisionId))
{
this.drpInstitutionalDivision.SelectedValue = person.InstitutionalDivisionId;
}
if (!string.IsNullOrEmpty(person.DepartId))
{
this.drpDepart.SelectedValue = person.DepartId;
}
if (!string.IsNullOrEmpty(person.EmployeeCategoryId))
{
this.drpEmployeeCategory.SelectedValue = person.EmployeeCategoryId;
}
if (!string.IsNullOrEmpty(person.EmployeeSubgroupId))
{
this.drpEmployeeSubgroup.SelectedValue = person.EmployeeSubgroupId;
}
if (!string.IsNullOrEmpty(person.ViceCNProfessionalId))
{
this.drpViceCNProfessional.SelectedValueArray = person.ViceCNProfessionalId.Split(',');
@@ -162,6 +178,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.txtAddress.Text = person.Address;
this.txtTelephone.Text = person.Telephone;
this.txtOutResult.Text = person.OutResult;
this.txtRemarks.Text = person.Remarks;
if (person.IsForeign.HasValue)
{
this.ckIsForeign.Checked = person.IsForeign.Value;
@@ -276,7 +293,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
PostTitleService.InitPostTitleDropDownList(this.drpTitle, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.ProjectId, this.UnitId, true);
CertificateService.InitCertificateDropDownList(this.drpCertificate, true);
UserService.InitFlowOperateControlUserDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true);
UserService.InitFlowOperateControlUserDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true);
EmployeeCategoryService.InitCategoryDropDownList(this.drpEmployeeCategory, true);//人员分类
EmployeeSubgroupService.InitSubgroupDropDownList(this.drpEmployeeSubgroup, true);//人员子组
DepartService.InitDepartDropDownList(this.drpDepart, true);//组织单元、部门
InstitutionalDivisionService.InitInstitutionalDivisionDropDownList(this.drpInstitutionalDivision, true);//机构划分
CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpEduLevel, "EDU_LEVEL", true);
@@ -463,6 +484,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.MaritalStatus = this.drpMaritalStatus.SelectedValue;
}
if (this.drpInstitutionalDivision.SelectedValue != Const._Null)
{
person.InstitutionalDivisionId = this.drpInstitutionalDivision.SelectedValue;
}
if (this.drpDepart.SelectedValue != Const._Null)
{
person.DepartId = this.drpDepart.SelectedValue;
}
if (this.drpEmployeeCategory.SelectedValue != Const._Null)
{
person.EmployeeCategoryId = this.drpEmployeeCategory.SelectedValue;
}
if (this.drpEmployeeSubgroup.SelectedValue != Const._Null)
{
person.EmployeeSubgroupId = this.drpEmployeeSubgroup.SelectedValue;
}
if (this.drpMainCNProfessional.SelectedValue != Const._Null)
{
person.MainCNProfessionalId = this.drpMainCNProfessional.SelectedValue;
@@ -487,6 +524,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
person.Address = this.txtAddress.Text.Trim();
person.Telephone = this.txtTelephone.Text.Trim();
person.OutResult = this.txtOutResult.Text.Trim();
person.Remarks = this.txtRemarks.Text.Trim();
if (!string.IsNullOrEmpty(this.txtInTime.Text.Trim()))
{
person.InTime = Convert.ToDateTime(this.txtInTime.Text.Trim());
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs
Generated
+81 -36
View File
@@ -230,6 +230,24 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.Grid gvWorkArea;
/// <summary>
/// drpInstitutionalDivision 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstitutionalDivision;
/// <summary>
/// drpDepart 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDepart;
/// <summary>
/// drpMainCNProfessional 控件。
/// </summary>
@@ -239,24 +257,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.DropDownList drpMainCNProfessional;
/// <summary>
/// drpAuditor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAuditor;
/// <summary>
/// ckIsForeign 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsForeign;
/// <summary>
/// txtBirthday 控件。
/// </summary>
@@ -356,6 +356,24 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.DropDownList drpTeamGroup;
/// <summary>
/// drpEmployeeCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpEmployeeCategory;
/// <summary>
/// drpEmployeeSubgroup 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpEmployeeSubgroup;
/// <summary>
/// drpViceCNProfessional 控件。
/// </summary>
@@ -365,24 +383,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.DropDownList drpViceCNProfessional;
/// <summary>
/// txtAuditorDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtAuditorDate;
/// <summary>
/// ckIsOutside 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsOutside;
/// <summary>
/// txtTelephone 控件。
/// </summary>
@@ -554,6 +554,42 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsCardUsed;
/// <summary>
/// drpAuditor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAuditor;
/// <summary>
/// txtAuditorDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtAuditorDate;
/// <summary>
/// ckIsForeign 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsForeign;
/// <summary>
/// ckIsOutside 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsOutside;
/// <summary>
/// txtAddress 控件。
/// </summary>
@@ -581,6 +617,15 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.TextBox txtOutResult;
/// <summary>
/// txtRemarks 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemarks;
/// <summary>
/// Window1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_TCC)
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
{
strSql += " AND UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue));
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
else
{
this.drpUnit.SelectedValue = Const.UnitId_TCC;
this.drpUnit.SelectedValue = Const.UnitId_XJYJ;
}
// 绑定表格
BindGrid();
SGGL/FineUIPro.Web/HSSE/SitePerson/SendCardView.aspx.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (!IsPostBack)
{
this.lbThisUnit.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC);
this.lbThisUnit.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ);
this.lbProject.Text = ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.PersonId = Request.Params["PersonId"];
SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.ProjectId = Request.Params["projectId"];
}
UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
{
this.drpUnit.Enabled = false;
SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs
+2 -2
View File
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
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;
}
@@ -138,7 +138,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
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/HSSE/SolutionNew/EditConstructSolution.aspx.cs
+1 -1
View File
@@ -103,7 +103,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
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/HSSE/Technique/HazardListEdit.aspx.cs
+1 -1
View File
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.HSSE.Technique
if (string.IsNullOrEmpty(this.HazardId))
{
hazardList.CompileMan = this.CurrUser.UserName;
hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
hazardList.CompileDate = DateTime.Now;
hazardList.IsPass = true;
hazardList.HazardId = SQLHelper.GetNewID(typeof(Model.Technique_HazardList));
SGGL/FineUIPro.Web/HSSE/Technique/HazardListIn.aspx.cs
+1 -1
View File
@@ -612,7 +612,7 @@ namespace FineUIPro.Web.HSSE.Technique
hazardList.CompileMan = this.CurrUser.UserName;
hazardList.CompileDate = DateTime.Now;
hazardList.IsPass = true;
hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
BLL.HazardListService.AddHazardList(hazardList);
BLL.LogService.AddSys_Log(this.CurrUser, hazardList.HazardCode, hazardList.HazardId, BLL.Const.HazardListMenuId, Const.BtnAdd);
}
SGGL/FineUIPro.Web/HSSE/Technique/RectifyItemEdit.aspx.cs
+1 -1
View File
@@ -102,7 +102,7 @@ namespace FineUIPro.Web.HSSE.Technique
if (string.IsNullOrEmpty(this.RectifyItemId))
{
rectifyItem.CompileMan = this.CurrUser.UserName;
rectifyItem.UnitId = String.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId;
rectifyItem.UnitId = String.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId;
rectifyItem.CompileDate = DateTime.Now;
rectifyItem.IsPass = true;
rectifyItem.RectifyItemId = SQLHelper.GetNewID(typeof(Model.Technique_RectifyItem));