From cd3196ba5543a0830dca106b9741de5236803cdb 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: Tue, 7 Apr 2026 17:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E6=8E=A7=E4=BC=98=E5=8C=96=E5=8F=8Asa?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 14 ++++-- .../APT.BS.WebApi/appsettings.Test.json | 2 +- .../APT.FM.WebApi/appsettings.Test.json | 2 +- .../APT.OP.WebApi/appsettings.Test.json | 2 +- .../APT.PF.WebApi/appsettings.Test.json | 2 +- .../APT.PP.WebApi/appsettings.Test.json | 2 +- .../APT.SC.WebApi/appsettings.Test.json | 2 +- .../HiddenDangerRectifyNoticeController.cs | 46 +++++++++---------- .../HiddenDangerRectifyRecordController.cs | 8 ++++ .../APT.SK.WebApi/appsettings.Test.json | 2 +- 10 files changed, 49 insertions(+), 33 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 1c9b5bc..8a0ac15 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -11723,6 +11723,10 @@ namespace APT.BaseData.Services.DomainServices { user = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID); } + if (user == null) + { + throw new Exception("未找到整改责任人对应组织的安全员和负责人，请确认基础配置已完善"); + } T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE(); notice.ORG_ID = detail.ORG_ID; notice.HIDDEN_DANGER_REPORT_ID = entity.ID; @@ -11735,7 +11739,7 @@ namespace APT.BaseData.Services.DomainServices notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; - notice.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now; + notice.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : entity.CREATE_TIME; notice.CHECK_PERSON = entity.CHECK_PERSON; notice.NOTICE_CODE = entity.NOTICE_CODE; notices.Add(notice); @@ -12135,6 +12139,10 @@ namespace APT.BaseData.Services.DomainServices { user = users.FirstOrDefault(t => t.ID == departFist?.USER_ID); } + if (user == null) + { + throw new Exception("未找到整改责任人对应组织的安全员和负责人，请确认基础配置已完善"); + } notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE(); notice.ORG_ID = entity.ORG_ID; notice.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID; @@ -12145,8 +12153,8 @@ namespace APT.BaseData.Services.DomainServices notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; - notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; - notice.CREATE_TIME = entity.Nav_Report?.CREATE_TIME; + notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; + notice.CHECK_TIME = entity.Nav_Report?.CREATE_TIME; notice.CHECK_PERSON = entity.Nav_ApplyUser?.NAME; notice.NOTICE_CODE = entity.NOTICE_CODE; if (entity.Nav_Files != null && entity.Nav_Files.Any()) diff --git a/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json b/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json index 4288c17..d1fe4ad 100644 --- a/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", diff --git a/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json b/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json index b39a4c7..b555a7e 100644 --- a/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json @@ -6,7 +6,7 @@ //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", diff --git a/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json b/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json index 1dc2bb1..9a4a647 100644 --- a/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json @@ -6,7 +6,7 @@ //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=localhost;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" }, "AppSettings": { diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json b/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json index 8b356b8..91c2076 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json @@ -6,7 +6,7 @@ //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" //��ʽ���� }, "AppSettings": { "DataBaseType": "sqlserver", diff --git a/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json b/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json index 77391c9..bd4e1e9 100644 --- a/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;", + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;", "tpm": "Data Source=10.2.7.17;Initial Catalog=QLTPMDB;Persist Security Info=True;User ID=MHUser;Password=MHUser2024ok%" }, "AppSettings": { diff --git a/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json b/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json index d4376ed..6f51ecf 100644 --- a/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;", + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" //"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;" }, "AppSettings": { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs index dfc4a94..c337a90 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs @@ -46,27 +46,27 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.APPLY_DEPARTMENT_ID == null) entity.APPLY_DEPARTMENT_ID = departId; T_FM_NOTIFICATION_TASK finishNotice = null; - if (entity.STATUS != PFStandardStatus.Draft) - { - var taskId = entity.TaskID; - if (taskId == Guid.Empty) - { - var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId - && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK020"); - if (taskTemp != null) - { - taskTemp.NOTICE_STATUS = 1; - taskTemp.SOURCE_FORMCODE = "SK020_SHOWPRINT"; - finishNotice = taskTemp; - } - } - if (taskId != Guid.Empty) - { - finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK020_SHOWPRINT"); - } - UpdateEntity(finishNotice); - throw new Exception("你已提交,请勿重复提交!"); - } + //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) + //{ + // var taskId = entity.TaskID; + // if (taskId == Guid.Empty) + // { + // var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId + //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK020"); + // if (taskTemp != null) + // { + // taskTemp.NOTICE_STATUS = 1; + // taskTemp.SOURCE_FORMCODE = "SK020_SHOWPRINT"; + // finishNotice = taskTemp; + // } + // } + // if (taskId != Guid.Empty) + // { + // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK020_SHOWPRINT"); + // } + // UpdateEntity(finishNotice); + // throw new Exception("你已提交,请勿重复提交!"); + //} var details = entity.Nav_RectifyDetails; entity.Nav_RectifyDetails = null; var files = entity.Nav_RectifyFiles; @@ -568,7 +568,7 @@ namespace APT.SK.WebApi.Controllers.Api return SafeExecute(() => { T_FM_NOTIFICATION_TASK task = null; - var notice = this.GetEntity(entity.ID, "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_ImplementUser"); + var notice = this.GetEntity(entity.ID, "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_RectifyDetailReasons", "Nav_RectifyDetails.Nav_ImplementUser"); var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; if (entity.TaskID != Guid.Empty) { @@ -578,7 +578,7 @@ namespace APT.SK.WebApi.Controllers.Api userId = currTask.USER_ID; } } - var details = this.GetEntities(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == notice.ID && t.ACCEPT_USER_ID == userId, new BaseFilter(notice.ORG_ID), "Nav_RectifyDetailFiles", "Nav_RectifyDetailReasons").ToList(); + var details = this.GetEntities(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == notice.ID && t.ACCEPT_USER_ID == userId, new BaseFilter(notice.ORG_ID)).ToList(); details.ForEach(t => { t.ISCHECK = true; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 1103dc0..ab6fedb 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -97,6 +97,10 @@ namespace APT.SK.WebApi.Controllers entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; entity.NOTICE_CODE = record.NOTICE_CODE; } + if (entity.COMPLETE_DATE == null) + { + entity.COMPLETE_DATE = DateTime.Now; + } var photoas = entity.Nav_RectifyPhotoas; entity.Nav_RectifyPhotoas = null; var photobs = entity.Nav_RectifyPhotobs; @@ -200,6 +204,10 @@ namespace APT.SK.WebApi.Controllers } else { + if (entity.ACCEPT_DATE == null) + { + entity.ACCEPT_DATE = DateTime.Now; + } //触发审批 entity.STATUS = PFStandardStatus.Approving; //取审批流水码 diff --git a/APT.MicroApi/APT.SK.WebApi/appsettings.Test.json b/APT.MicroApi/APT.SK.WebApi/appsettings.Test.json index 6968005..4136661 100644 --- a/APT.MicroApi/APT.SK.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.SK.WebApi/appsettings.Test.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver",