From 7518e67a7993d1dc9ceb84cf6beb9f306b9b60d9 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, 8 Apr 2026 16:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=BE=A8=E8=AF=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/FM/FMFlowPermitService.cs | 29 ++++++----- .../Services/PF/PFApproveCallBackService.cs | 4 +- .../Controllers/Api/ApproveController.cs | 51 ++++++++++--------- .../Controllers/Api/SKController.cs | 27 +++++----- .../Api/IdentifyEvaluationPlanController.cs | 4 +- 5 files changed, 64 insertions(+), 51 deletions(-) diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs index a12a5ff..72f4bb9 100644 --- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs +++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs @@ -1,22 +1,23 @@ using APT.BaseData.Domain.Entities; -using APT.BaseData.Domain.Enums; -using APT.Infrastructure.Core; -using System; using APT.BaseData.Domain.Entities.FM; -using APT.BaseData.Domain.IServices.FM; -using APT.Infrastructure.Api; -using System.Collections.Generic; -using System.Linq; -using APT.MS.Domain.Enums; +using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.IServices; -using System.Linq.Expressions; -using Newtonsoft.Json; -using APT.MS.Domain.Entities.PF; -using InfluxData.Net.InfluxDb.Models.Responses; using APT.BaseData.Domain.IServices.BS; +using APT.BaseData.Domain.IServices.FM; +using APT.Infrastructure.Api; +using APT.Infrastructure.Core; using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Entities.HM; +using APT.MS.Domain.Entities.PF; +using APT.MS.Domain.Entities.SK; +using APT.MS.Domain.Enums; +using InfluxData.Net.InfluxDb.Models.Responses; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; namespace APT.BaseData.Services.Services.FM { @@ -559,6 +560,10 @@ namespace APT.BaseData.Services.Services.FM case "HM122": case "HM123": endTime = Convert.ToDateTime(DateTime.Now.AddDays(1).ToString("D").ToString()).AddSeconds(-1); + break; + case "SK031": + var plan = this.GetEntity(t => t.ID == id); + endTime = (plan!=null && plan.START_DATE!=null)? plan.START_DATE.Value: DateTime.Now.AddHours(24); break; default: break; } diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 3cb2ed0..4ae5e4c 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13095,7 +13095,7 @@ namespace APT.BaseData.Services.DomainServices { var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); entity.STATUS = PFStandardStatus.Archived; - entity.END_DATE = DateTime.Now; + //entity.END_DATE = DateTime.Now; Guid? userId = null; T_SK_RISK_IDENTIFY_RESULT result = null; T_FM_NOTIFICATION_TASK notice = null; @@ -13689,7 +13689,7 @@ namespace APT.BaseData.Services.DomainServices sum.APPLY_USER_ID = user.ID; sum.YEAR = entity.YEAR; sum.START_DATE = entity.START_DATE; - sum.END_DATE = DateTime.Now; + sum.END_DATE = entity.END_DATE; sum.CONTENTS = entity.CONTENTS; sum.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID; sum.ISCOMPANY = entity.ISCOMPANY; diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs index a0a8944..870c20a 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs @@ -1,37 +1,38 @@ namespace APT.PF.WebApi.Controllers.Api { - using APT.Infrastructure.Core; - using Microsoft.AspNetCore.Mvc; - using System.Collections.Generic; - using APT.Utility; - using APT.Infrastructure.Api; using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.Entities; - using APT.BaseData.Domain.Enums.PF; - using System.Linq; - using System; - using APT.BaseData.Domain.IServices.FM; - using APT.MS.Domain.Enums; - using System.Dynamic; - using System.Reflection; - using APT.BaseData.Domain.Entities.PF; using APT.BaseData.Domain.Entities.FM; - using System.Linq.Expressions; - using APT.MS.Domain.Entities.BS; + using APT.BaseData.Domain.Entities.PF; using APT.BaseData.Domain.Enums; + using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.IServices; - using APT.MS.Domain.Entities.HM; - using Newtonsoft.Json; - using NPOI.Util; - using System.Data; - using NPOI.SS.Formula.Functions; - using APT.MS.Domain.Entities.SC; - using APT.Infrastructure.EF; + using APT.BaseData.Domain.IServices.FM; + using APT.BaseData.Domain.IServices.OP; using APT.BaseData.Services.DomainServices; using APT.BaseData.Services.Services.FM; using APT.BaseData.Services.Sys; + using APT.Infrastructure.Api; + using APT.Infrastructure.Core; + using APT.Infrastructure.EF; + using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Entities.FO; - using APT.BaseData.Domain.IServices.OP; + using APT.MS.Domain.Entities.HM; + using APT.MS.Domain.Entities.SC; + using APT.MS.Domain.Entities.SK; + using APT.MS.Domain.Enums; + using APT.Utility; + using Microsoft.AspNetCore.Mvc; + using Newtonsoft.Json; + using NPOI.SS.Formula.Functions; + using NPOI.Util; + using System; + using System.Collections.Generic; + using System.Data; + using System.Dynamic; + using System.Linq; + using System.Linq.Expressions; + using System.Reflection; [Route("api/PF/PFApprove")] public partial class ApproveController : AuthorizeApiController @@ -340,6 +341,10 @@ var job = this.GetEntity(t => t.ID == entity.DATA_ID, "Nav_OperationStep"); NoticeTitle = job != null && job.Nav_OperationStep != null ? entity.NAME + "-" + job.Nav_OperationStep?.NAME + "待审批" : NoticeTitle; endTime = Convert.ToDateTime(DateTime.Now.AddDays(1).ToString("D").ToString()).AddSeconds(-1); + break; + case "安全风险辨识与评估计划": + var plan = this.GetEntity(t => t.ID == entity.DATA_ID); + endTime = (plan != null && plan.START_DATE != null) ? plan.START_DATE.Value : DateTime.Now.AddHours(24); break; default: break; } diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index a619cb7..8d7b1ac 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -1567,7 +1567,7 @@ namespace APT.PP.WebApi.Controllers.Api var endtime = DateTime.Now.AddHours(24); if (plan.END_DATE != null) { - endtime = Convert.ToDateTime(plan.END_DATE.ToString().Replace("0:00:00", "23:59:59")); + endtime = Convert.ToDateTime(plan.END_DATE.ToString()); } var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表" + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'), ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033"); notices.Add(noticeTask); @@ -1651,7 +1651,8 @@ namespace APT.PP.WebApi.Controllers.Api Expression> newexpression = i => planIds.Contains((Guid)i.IDENTIFY_EVALUATION_PLAN_ID); List identityTemps = this.GetOrderEntities(newexpression, newFilter).ToList(); identitys = identityTemps.Where(t => t.STATUS != PFStandardStatus.Archived && t.STATUS != PFStandardStatus.Close).ToList(); - var identityPlanIds = identitys.Select(t => t.IDENTIFY_EVALUATION_PLAN_ID).Distinct().ToList(); + var identityPlanIds = identityTemps.Select(t => t.IDENTIFY_EVALUATION_PLAN_ID).Distinct().ToList(); + planIds = planIds.Where(t => identityPlanIds.Contains(t)).Distinct().ToList(); //plans = planTemps.Where(t => identityPlanIds.Contains(t.ID)).ToList(); var identityIds = identitys.Select(i => i.ID).ToList(); var approvIds = this.GetEntities(t => identityIds.Contains(t.DATA_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList(); @@ -1670,7 +1671,8 @@ namespace APT.PP.WebApi.Controllers.Api identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close; m.END_DATE = DateTime.Now; }); tasks.ForEach(t => { t.NOTICE_STATUS = 4; t.SOURCE_FORMCODE = "SK033_SHOWPRINT"; }); foreach (var plan in planIds) - { + { + var planTemp = planTemps.FirstOrDefault(t => t.ID == plan); var ides = identityTemps.Where(t => t.IDENTIFY_EVALUATION_PLAN_ID == plan).ToList(); if (ides.Any()) { @@ -1713,11 +1715,10 @@ namespace APT.PP.WebApi.Controllers.Api result.ISAUTO = true; result.ISCOMPANY = SKIsStoreEnum.Yes; result.CONTENTS = deTemp?.CONTENTS; - result.START_DATE = DateTime.Now; - result.END_DATE = DateTime.Now; + result.START_DATE = planTemp.START_DATE; + result.END_DATE = planTemp.END_DATE; result.REQUIRE_ID = requre?.ID; results.Add(result); - var planTemp = planTemps.FirstOrDefault(t => t.ID == plan); if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any()) { foreach (var itemReq in planTemp.Nav_Requires) @@ -1878,11 +1879,11 @@ namespace APT.PP.WebApi.Controllers.Api result.ISAUTO = true; result.ISCOMPANY = SKIsStoreEnum.No; result.CONTENTS = deTemp.CONTENTS; - result.START_DATE = DateTime.Now; - result.END_DATE = DateTime.Now; + result.START_DATE = planTemp.START_DATE; + result.END_DATE = planTemp.END_DATE; result.REQUIRE_ID = requre?.ID; results.Add(result); - var planTemp = planTemps.FirstOrDefault(t => t.ID == plan); + if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any()) { foreach (var itemReq in planTemp.Nav_Requires) @@ -2074,11 +2075,10 @@ namespace APT.PP.WebApi.Controllers.Api result.ISAUTO = true; result.ISCOMPANY = SKIsStoreEnum.No; result.CONTENTS = deTemp.CONTENTS; - result.START_DATE = DateTime.Now; - result.END_DATE = DateTime.Now; + result.START_DATE = planTemp.START_DATE; + result.END_DATE = planTemp.END_DATE; result.REQUIRE_ID = requre?.ID; results.Add(result); - var planTemp = planTemps.FirstOrDefault(t => t.ID == plan); if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any()) { foreach (var itemReq in planTemp.Nav_Requires) @@ -5436,6 +5436,7 @@ namespace APT.PP.WebApi.Controllers.Api var userInfo = users.Where(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_Person != null && t.Nav_Person.POST_ID == item.CheckPostId).ToList(); if (userInfo != null && userInfo.Any() && sche != null) { + var j = 1; foreach (var user in userInfo) { //判断是否重复触发 @@ -5461,6 +5462,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'); records.Add(record); if (item.details != null && item.details.Any()) { @@ -5514,6 +5516,7 @@ namespace APT.PP.WebApi.Controllers.Api } var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "岗位排查记录" + date, record.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK010"); notices.Add(notice); + j++; } } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs index 0da4444..aa5f0b7 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs @@ -56,9 +56,9 @@ namespace APT.SK.WebApi.Controllers.Api entity.Nav_Evaluations = null; entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; - if (entity.START_DATE.Value.Date < DateTime.Now.Date) + if (entity.START_DATE < DateTime.Now.AddDays(3)) { - throw new Exception("辨识开始时间必须大于今天"); + throw new Exception("辨识开始时间必须大于"+ DateTime.Now.AddDays(3)); } List deleteUserIds = new List(); List deleteIds = new List();