From 3ad86aca1d30a95885088f96a55a25f58c2e1e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 26 Nov 2025 17:25:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index 2d40d2d..f8186a6 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -48,13 +48,15 @@ namespace APT.FO.WebApi.Controllers var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString(); if (string.IsNullOrEmpty(id)) this.ThrowError("060010"); - var entity = this.GetEntity(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_FireDepartment", "Nav_Users.Nav_User", - "Nav_SafeUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Area", "Nav_Type", "Nav_MonitorUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Risks", "Nav_Files.Nav_ImgFile", "Nav_Users.Nav_UserType", "Nav_Users.Nav_Train", "Nav_Users.Nav_UserFiles.Nav_ImgFile", + var entity = this.GetEntity(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_FireDepartment", + "Nav_SafeUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Area", "Nav_Type", "Nav_MonitorUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Risks", "Nav_Files.Nav_ImgFile", "Nav_FireFiles.Nav_ImgFile", "Nav_MonitorFiles.Nav_ImgFile", "Nav_DispatchUser.Nav_UserSignFiles.Nav_ImgFile"); if (entity != null) { var details = this.GetEntities(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList(); entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList(); + var users = this.GetEntities(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_UserType", "Nav_Train", "Nav_UserFiles.Nav_ImgFile", "Nav_User").ToList(); + entity.Nav_Users = users.ToList(); } return entity; }); From 68bf40e59e905d716f76a73a7e50eb7853e0e180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 26 Nov 2025 17:38:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=AE=A1?= =?UTF-8?q?=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/FireJobWbController.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs index 30f1fa8..a2b68d2 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs @@ -47,13 +47,15 @@ namespace APT.FO.WebApi.Controllers if (string.IsNullOrEmpty(id)) this.ThrowError("060010"); var entity = this.GetEntity(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_Related", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_ImgFile", - "Nav_SafeUser.Nav_ImgFile", "Nav_Area", "Nav_Type", "Nav_MonitorUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Risks", "Nav_Files.Nav_ImgFile", "Nav_Users.Nav_UserType", "Nav_Users.Nav_UserFiles.Nav_ImgFile", - "Nav_Users.Nav_Signs.Nav_ImgFile", "Nav_Users.Nav_User", "Nav_DispatchUser.Nav_UserSignFiles.Nav_ImgFile", + "Nav_SafeUser.Nav_ImgFile", "Nav_Area", "Nav_Type", "Nav_MonitorUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_Risks", "Nav_Files.Nav_ImgFile", + "Nav_DispatchUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_FireFiles.Nav_ImgFile", "Nav_MonitorFiles.Nav_ImgFile"); if (entity != null) { var details = this.GetEntities(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList(); entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m=>m.NUM).ToList(); + var users = this.GetEntities(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_UserType", "Nav_Train", "Nav_UserFiles.Nav_ImgFile", "Nav_User", "Nav_Signs.Nav_ImgFile").ToList(); + entity.Nav_Users = users.ToList(); } return entity; }); From 992d3b535ac150762f00d271e49430f3b3c1ff76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 26 Nov 2025 18:06:12 +0800 Subject: [PATCH 3/3] 1 --- .../APT.FO.WebApi/Controllers/FireJobController.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index f8186a6..5816e4b 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -87,6 +87,14 @@ namespace APT.FO.WebApi.Controllers { entity.CODE = "DHZY" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); } + if (entity.FIRE_USER_ID == null) + { + throw new Exception("动火负责人必须填写"); + } + if (entity.SAFE_USER_ID == null) + { + throw new Exception("安全管理人员必须填写"); + } var details = entity.Nav_Details; if (details != null && details.Any()) {