diff --git a/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql b/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql index 72d6221..35ef164 100644 Binary files a/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql and b/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql differ diff --git a/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs b/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs index a6d3bec..2a39737 100644 --- a/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs +++ b/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs @@ -170,5 +170,41 @@ namespace BLL } } } + + + + + + /// + /// 修改HazardRegister + /// + /// + /// + public static void updateHazardRegister(Model.HazardRegisterItem hazardRegister) + { + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) + { + var isUpdate = + db.HSSE_Hazard_HazardRegister_Unit.FirstOrDefault(x => + x.HazardRegisterId == hazardRegister.HazardRegisterId); + if (isUpdate != null) + { + isUpdate.CheckTime = DateTime.Now; + isUpdate.ReviewedManId = hazardRegister.ReviewedManId; + isUpdate.RegisterDef = hazardRegister.RegisterDef; + isUpdate.Requirements = hazardRegister.Requirements; + //判断如果查询的会审人和修改的会审人一致,状态改为1 + if (!string.IsNullOrEmpty(isUpdate.CCManIds) && !string.IsNullOrEmpty(hazardRegister.ReviewedManId)) + { + bool areEqual = string.Join(",", isUpdate.CCManIds.Split(',').OrderBy(x => x)) == string.Join(",", hazardRegister.ReviewedManId.Split(',').OrderBy(x => x)); + if (areEqual) + { + isUpdate.States = "1"; + } + } + db.SubmitChanges(); + } + } + } } } \ No newline at end of file diff --git a/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs b/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs index 4697cf9..f9c299e 100644 --- a/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs +++ b/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs @@ -193,6 +193,10 @@ namespace BLL public static List GetStatesList() { List handleSteps = new List(); + Model.HandleStep handleStep5 = new Model.HandleStep(); + handleStep5.Id = "4"; + handleStep5.Name = "待会审"; + handleSteps.Add(handleStep5); Model.HandleStep handleStep1 = new Model.HandleStep(); handleStep1.Id = "1"; handleStep1.Name = "待整改"; diff --git a/SUBQHSE/Model/APIItem/HSSE/HazardRegisterItem.cs b/SUBQHSE/Model/APIItem/HSSE/HazardRegisterItem.cs index f928e53..e2b6cf9 100644 --- a/SUBQHSE/Model/APIItem/HSSE/HazardRegisterItem.cs +++ b/SUBQHSE/Model/APIItem/HSSE/HazardRegisterItem.cs @@ -367,5 +367,13 @@ namespace Model get; set; } + /// + /// 会审人ids + /// + public string ReviewedManId + { + get; + set; + } } } diff --git a/SUBQHSE/Model/Model.cs b/SUBQHSE/Model/Model.cs index cdb38d4..1097d5c 100644 --- a/SUBQHSE/Model/Model.cs +++ b/SUBQHSE/Model/Model.cs @@ -202375,6 +202375,8 @@ namespace Model private string _Risk_Level; + private string _ReviewedManId; + private EntityRef _Base_Unit; #region 可扩展性方法定义 @@ -202467,6 +202469,8 @@ namespace Model partial void OnRequirementsChanged(); partial void OnRisk_LevelChanging(string value); partial void OnRisk_LevelChanged(); + partial void OnReviewedManIdChanging(string value); + partial void OnReviewedManIdChanged(); #endregion public HSSE_Hazard_HazardRegister_Unit() @@ -203339,6 +203343,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewedManId", DbType="NVarChar(2000)")] + public string ReviewedManId + { + get + { + return this._ReviewedManId; + } + set + { + if ((this._ReviewedManId != value)) + { + this.OnReviewedManIdChanging(value); + this.SendPropertyChanging(); + this._ReviewedManId = value; + this.SendPropertyChanged("ReviewedManId"); + this.OnReviewedManIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Unit_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { diff --git a/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs b/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs index 1be27ff..9888222 100644 --- a/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs +++ b/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs @@ -184,5 +184,33 @@ namespace WebAPI return responeData; } #endregion + + + #region 会审人提交操作 + + /// + /// 修改HazardRegister + /// + /// + /// + [HttpPost] + public Model.ResponeData updateHazardRegister([FromBody] Model.HazardRegisterItem hazardRegister) + { + var responeData = new Model.ResponeData(); + try + { + BLL.APIUnitHazardRegisterService.updateHazardRegister(hazardRegister); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + + return responeData; + } + #endregion + + } } \ No newline at end of file