From 75041220af9b3c919545bbbc1acc1aabd3d8c1d7 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Tue, 16 Sep 2025 17:15:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=AE=A1=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_2025-09-16-geh.sql | Bin 1410 -> 59586 bytes .../ZJ/API/APIUnitHazardRegisterService.cs | 36 ++++++++++++++++++ .../UnitHSSE_Hazard_HazardRegisterService.cs | 4 ++ .../Model/APIItem/HSSE/HazardRegisterItem.cs | 8 ++++ SUBQHSE/Model/Model.cs | 24 ++++++++++++ .../ZJ/UnitHazardRegisterController.cs | 28 ++++++++++++++ 6 files changed, 100 insertions(+) diff --git a/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql b/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql index 72d6221fc12f7a6d6085edc16253d0e175daaea1..35ef1642736d1f5defea06cdabfa0450c85761fe 100644 GIT binary patch literal 59586 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 + /// 修改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