From 887c75c6197e98abee70f304d1e982e21719da7f 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 11:55:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs | 2 +- .../Controllers/PreShiftMeetingRecordController.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index f333013..2ff30d2 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -659,7 +659,7 @@ namespace APT.FO.WebApi.Controllers { var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType; var tempList = mineType.Split(",").ToList(); - var analyze = GetEntity(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString()),new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" }); + var analyze = GetEntity(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用,new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" }); if (analyze!=null) { main.AUDIT_LEVEL=analyze.AUDIT_LEVEL; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 8b382ae..74f99b8 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -316,6 +316,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye); } } + if (entity.CLASS_ID == null) + { + entity.START_TIME = DateTime.Now; + entity.END_TIME = entity.START_TIME.AddHours(24); + } entity.Nav_User = null; users.ForEach(t => t.Nav_User = null); users.ForEach(t => t.ORG_ID = entity.ORG_ID); From a15062eaab0a7dc0e2a396dab11d3e93db371d4e 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 13:17:55 +0800 Subject: [PATCH 2/3] 2 --- .../Api/DoublePreventMechanismController.cs | 121 +++++------------- 1 file changed, 33 insertions(+), 88 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs index f661dbc..7910cb3 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs @@ -79,11 +79,11 @@ namespace APT.SK.WebApi.Controllers.Api List basicList = new List(); if (details != null && details.Any()) { - var first = details.FirstOrDefault(t => t.AREA_ID != entity.RISK_AREA_ID); - if (first != null && entity.RISK_AREA_ID != null) - { - throw new Exception("主表的检查区域与子表的辨识区域需保持一致！"); - } + //var first = details.FirstOrDefault(t => t.AREA_ID != entity.RISK_AREA_ID); + //if (first != null && entity.RISK_AREA_ID != null) + //{ + // throw new Exception("主表的检查区域与子表的辨识区域需保持一致！"); + //} detailIds = this.GetEntities(t => t.DOUBLE_PREVENT_MECHANISM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); detailPostIds = this.GetEntities(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); measureIds = this.GetEntities(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); @@ -167,34 +167,34 @@ namespace APT.SK.WebApi.Controllers.Api detailPostList.Add(item2); } } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险) - { - if (!departType.Contains("公司级")) - { - throw new Exception(item.RISK_NAME + "，重大风险管控层级必须包含公司级"); - } - } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险) - { - if (!departType.Contains("部门级") && !departType.Contains("公司级")) - { - throw new Exception(item.RISK_NAME + "，较大风险管控层级必须大于部门级"); - } - } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险) - { - if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级")) - { - throw new Exception(item.RISK_NAME + "，一般风险管控层级必须大于车间级"); - } - } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险) - { - if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级") && !departType.Contains("班组级")) - { - throw new Exception(item.RISK_NAME + "，低风险管控层级必须大于班组级"); - } - } + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险) + //{ + // if (!departType.Contains("公司级")) + // { + // throw new Exception(item.RISK_NAME + "，重大风险管控层级必须包含公司级"); + // } + //} + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险) + //{ + // if (!departType.Contains("部门级") && !departType.Contains("公司级")) + // { + // throw new Exception(item.RISK_NAME + "，较大风险管控层级必须大于部门级"); + // } + //} + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险) + //{ + // if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级")) + // { + // throw new Exception(item.RISK_NAME + "，一般风险管控层级必须大于车间级"); + // } + //} + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险) + //{ + // if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级") && !departType.Contains("班组级")) + // { + // throw new Exception(item.RISK_NAME + "，低风险管控层级必须大于班组级"); + // } + //} if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any()) { foreach (var item2 in item.Nav_DetailDeparts) @@ -271,50 +271,22 @@ namespace APT.SK.WebApi.Controllers.Api BantchSaveEntityNoCommit(files); if (details != null && details.Any()) BantchSaveEntityNoCommit(details); - else - { - throw new Exception("风险明细不能为空"); - } if (detailPostList != null && detailPostList.Any()) BantchSaveEntityNoCommit(detailPostList); - else - { - throw new Exception("管控层级明细不能为空"); - } if (detailDepartList != null && detailDepartList.Any()) BantchSaveEntityNoCommit(detailDepartList); - else - { - throw new Exception("辨识岗位明细不能为空"); - } if (departDetailList != null && departDetailList.Any()) BantchSaveEntityNoCommit(departDetailList); if (measureList != null && measureList.Any()) BantchSaveEntityNoCommit(measureList); - else - { - throw new Exception("管控措施明细不能为空"); - } if (contentList != null && contentList.Any()) BantchSaveEntityNoCommit(contentList); - else - { - throw new Exception("检查内容明细不能为空"); - } if (hiddenList != null && hiddenList.Any()) BantchSaveEntityNoCommit(hiddenList); - else - { - throw new Exception("隐患明细不能为空"); - } if (basicList != null && basicList.Any()) BantchSaveEntityNoCommit(basicList); if (postList != null && postList.Any()) BantchSaveEntityNoCommit(postList); - else - { - throw new Exception("检查层级明细不能为空"); - } if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); }, null, null, null, null, null, "SK026_SHOWPRINT", null, "风险检查关联表审批"); @@ -350,49 +322,22 @@ namespace APT.SK.WebApi.Controllers.Api BantchSaveEntityNoCommit(files); if (details != null && details.Any()) BantchSaveEntityNoCommit(details); - else - { - throw new Exception("风险明细不能为空"); - } if (detailPostList != null && detailPostList.Any()) BantchSaveEntityNoCommit(detailPostList); - else - { - throw new Exception("管控层级明细不能为空"); - } if (detailDepartList != null && detailDepartList.Any()) BantchSaveEntityNoCommit(detailDepartList); - else - { - throw new Exception("辨识岗位明细不能为空"); - } if (departDetailList != null && departDetailList.Any()) BantchSaveEntityNoCommit(departDetailList); if (measureList != null && measureList.Any()) BantchSaveEntityNoCommit(measureList); - else - { - throw new Exception("管控措施明细不能为空"); - } if (contentList != null && contentList.Any()) BantchSaveEntityNoCommit(contentList); - else - { - throw new Exception("检查内容明细不能为空"); - } if (hiddenList != null && hiddenList.Any()) BantchSaveEntityNoCommit(hiddenList); - { - throw new Exception("隐患明细不能为空"); - } if (basicList != null && basicList.Any()) BantchSaveEntityNoCommit(basicList); if (postList != null && postList.Any()) BantchSaveEntityNoCommit(postList); - else - { - throw new Exception("检查层级明细不能为空"); - } if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); }); From 5a4659b7bf7ebfd2b33e351c31de600dff5179f3 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 16:38:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=96=B7=E6=B0=B4?= =?UTF-8?q?=E5=91=98=E5=92=8C=E7=93=A6=E6=A3=80=E5=91=98=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FireJobController.cs | 52 +++++++++--------- .../Controllers/FireJobWbController.cs | 54 +++++++++---------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index cf63aae..2d40d2d 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -187,32 +187,32 @@ namespace APT.FO.WebApi.Controllers { throw new Exception("动火操作人员必须上传附件"); } - var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); - if (wjUser == null) - { - throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); - } - else - { - var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); - if (wjUserHas == null) - { - throw new Exception("作业人员必须要有瓦检员"); - } - } - var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); - if (psUser == null) - { - throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); - } - else - { - var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); - if (psUserHas == null) - { - throw new Exception("作业人员必须要有喷水人员"); - } - } + //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); + //if (wjUser == null) + //{ + // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); + //} + //else + //{ + // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); + // if (wjUserHas == null) + // { + // throw new Exception("作业人员必须要有瓦检员"); + // } + //} + //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); + //if (psUser == null) + //{ + // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); + //} + //else + //{ + // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); + // if (psUserHas == null) + // { + // throw new Exception("作业人员必须要有喷水人员"); + // } + //} foreach (var item in users) { item.ORG_ID = entity.ORG_ID; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs index d24f305..30f1fa8 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs @@ -191,37 +191,37 @@ namespace APT.FO.WebApi.Controllers { throw new Exception("动火操作人员必须填写证书编号"); } - var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID &&(t.Nav_UserFiles == null || !t.Nav_UserFiles.Any())); + var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID && (t.Nav_UserFiles == null || !t.Nav_UserFiles.Any())); if (dhfiles != null) { throw new Exception("动火操作人员必须上传附件"); } - var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); - if (wjUser == null) - { - throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); - } - else - { - var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); - if (wjUserHas == null) - { - throw new Exception("作业人员必须要有瓦检员"); - } - } - var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); - if (psUser == null) - { - throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); - } - else - { - var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); - if (psUserHas == null) - { - throw new Exception("作业人员必须要有喷水人员"); - } - } + //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); + //if (wjUser == null) + //{ + // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); + //} + //else + //{ + // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); + // if (wjUserHas == null) + // { + // throw new Exception("作业人员必须要有瓦检员"); + // } + //} + //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); + //if (psUser == null) + //{ + // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); + //} + //else + //{ + // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); + // if (psUserHas == null) + // { + // throw new Exception("作业人员必须要有喷水人员"); + // } + //} foreach (var item in users) { item.ORG_ID = entity.ORG_ID;