合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -109,7 +109,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (!string.IsNullOrEmpty(registration.CheckCycle))
{
this.ckType.SelectedValue = registration.CheckCycle;
this.ckType.SelectedValue = registration.CheckCycle ?? "D";
}
if (!string.IsNullOrEmpty(registration.ResponsibleMan))
{
@@ -125,6 +125,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
this.txtRegisterDef.Text = registration.RegisterDef;
this.txtRequirements.Text = registration.Requirements;
this.txtCutPayment.Text = registration.CutPayment.ToString();
this.txtCheckManName.Text = registration.CheckManName;
this.hdCheckManId.Text = registration.CheckManId;
@@ -213,13 +214,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// <param name="p"></param>
private void SaveData(bool isClosed)
{
Model.HSSE_Hazard_HazardRegister register = new Model.HSSE_Hazard_HazardRegister();
register.ProjectId = this.CurrUser.LoginProjectId;
register.ProblemTypes = "1"; //安全隐患问题
register.RegisterTypesId = this.drpRegisterTypes.SelectedValue;
register.CheckCycle = this.ckType.SelectedValue;
register.IsEffective = "1";
register.Risk_Level = this.dpRiskLevel.SelectedText;
Model.HSSE_Hazard_HazardRegister register = new Model.HSSE_Hazard_HazardRegister
{
ProjectId = this.CurrUser.LoginProjectId,
ProblemTypes = "1", //安全隐患问题
RegisterTypesId = this.drpRegisterTypes.SelectedValue,
CheckCycle = this.ckType.SelectedValue ?? "D",
IsEffective = "1",
Risk_Level = this.dpRiskLevel.SelectedValue,
Requirements = this.txtRequirements.Text.Trim()
};
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
register.ResponsibleUnit = this.drpUnit.SelectedValue;