From 11829f8b92f014b6cdd1fc15808eacacbcab880d 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: Thu, 16 Apr 2026 11:55:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.PP.WebApi/Controllers/Api/SKController.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 32b6035..20de5af 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5340,6 +5340,14 @@ namespace APT.PP.WebApi.Controllers.Api } if (detailContents != null && detailContents.Any()) { + foreach (var item in contents) + { + var detailLib = libraryDetails.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_ID); + var lib = librarys.FirstOrDefault(t => t.ID == detailLib?.ENTERPRISE_LIBRARY_ID); + item.RISK_NAME = lib?.RISK_NAME; + item.AREA_ID = lib?.AREA_ID; + item.Nav_Area = lib?.Nav_Area; + } foreach (var item in detailContents) { if (checkTypeIds != null && checkTypeIds.Any() && item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID)) From e90c3bafd5311bc80366024a7c627054ccfbbc61 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: Thu, 16 Apr 2026 14:30:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=B2=A1=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 20de5af..ca2fbc3 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5592,7 +5592,7 @@ namespace APT.PP.WebApi.Controllers.Api send = false; } } - if ((send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour)) + if ((!send && exist == null && item.CheckPost == "班组负责人" && dt.Hour == 8) || (send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour)) { T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE(); safeNotice.ORG_ID = filter.OrgId; From a02bcb3732860e703838b41cf134fc7ebea85089 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: Thu, 16 Apr 2026 17:38:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index ca2fbc3..b69180e 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5485,7 +5485,7 @@ namespace APT.PP.WebApi.Controllers.Api record.DEPARTMENT_TYPE = item.DepartType; record.STATUS = PFStandardStatus.Draft; record.ISAUTO = true; - record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0'); + record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999); records.Add(record); if (item.details != null && item.details.Any()) { @@ -5603,7 +5603,7 @@ namespace APT.PP.WebApi.Controllers.Api safeNotice.PLANCHECKFREQUENCY = item.Cycle; safeNotice.DEPARTMENT_TYPE = item.DepartType; safeNotice.STATUS = PFStandardStatus.Draft; - safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0'); + safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999); safeNotice.ISAUTO = true; safeNotices.Add(safeNotice); if (item.details != null && item.details.Any()) From ccbf37d26b47788ad64ff92b9a92520e12e0015c 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: Thu, 16 Apr 2026 18:32:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SecurityInspectionRecordController.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs index ba11039..c66b776 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs @@ -460,6 +460,10 @@ namespace APT.SK.WebApi.Controllers.Api throw new Exception("检查类型不能为空"); if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue) throw new Exception("检查时间必须填写"); + if (string.IsNullOrEmpty(entity.NOTICE_CODE)) + { + entity.NOTICE_CODE = "JCSD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999); + } T_FM_NOTIFICATION_TASK finishNotice = null; if (entity.STATUS != PFStandardStatus.Draft) { From 8784d17a42e18679f306d41d13f2dfb3144b875e 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: Fri, 17 Apr 2026 09:16:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/EnterpriseLibraryController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index b642cc6..26d1571 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -77,8 +77,8 @@ namespace APT.SK.WebApi.Controllers.Api public class CheckListNew { public string MineType { get; set; } - public Guid? PRODUCTION_UNIT_ID { get; set; } - + public Guid? PRODUCTION_UNIT_ID { get; set; } + public Guid? CHECK_TYPE_ID { get; set; } public string CheckType { get; set; } public string CheckCycle { get; set; } public string CheckLevel { get; set; } @@ -2677,6 +2677,7 @@ namespace APT.SK.WebApi.Controllers.Api { CheckListNew listNew = new CheckListNew(); listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; + listNew.CHECK_TYPE_ID = item.Key.CHECK_TYPE_ID; listNew.MineType = item.Key.MINE_NAME; listNew.CheckType = item.Key.TYPE_NAME; listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();