From cbc96f56e24a2d9ccebc5de014e48f42bfd5310f 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, 6 May 2026 17:52:57 +0800 Subject: [PATCH] bug --- .../Controllers/LeaderWellRecordController.cs | 16 ++++++++++++++++ .../Controllers/Api/SKController.cs | 10 +++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs index cab0830..905a28f 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs @@ -263,6 +263,18 @@ namespace APT.FO.WebApi.Controllers var sendNotices = new List(); if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { + if (!userList.Any()) + { + throw new Exception("值班领导不能为空"); + } + if (!afterUserList.Any()) + { + throw new Exception("接班人不能为空"); + } + if (!details.Any()) + { + throw new Exception("明细行至少填写一行，且现场责任人不能为空"); + } var allUsers = this.GetEntities(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(entity.ORG_ID)); var sendUserIds = userList.Where(t => t.USER_ID != loginUserId && t.USER_ID != null).Select(m => (Guid)m.USER_ID).Distinct().ToList(); if (sendUserIds != null && sendUserIds.Any()) @@ -292,6 +304,10 @@ namespace APT.FO.WebApi.Controllers sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, entity.ORG_ID, sendAfterUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); entity.STATUS = FOStatusEnum.SignAccept; } + else + { + entity.STATUS = FOStatusEnum.Archived; + } } } diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 4ffe8d5..41095a8 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5428,7 +5428,7 @@ namespace APT.PP.WebApi.Controllers.Api DateTime minTime = dt.AddMinutes(0); DateTime maxTime = dt.AddMinutes(60); var shiftClassAll = this.GetEntities(s => s.DATE_TIME.Date == dt.Date && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").ToList(); - var shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME).ToList(); + var shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime).ToList(); var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList(); var teamInfos = this.GetEntities(t =>t.ENABLE_STATUS == 0 , new BaseFilter(filter.OrgId)); var teamDepartIds = teamInfos.Where(t=>teamIds.Contains(t.ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList(); @@ -5601,6 +5601,14 @@ namespace APT.PP.WebApi.Controllers.Api { send = false; } + else + { + var startTime = scheTemp.START_TIME.AddHours(-1.5); + if (scheTemp.START_TIME.Date != scheTemp.END_TIME.Date || (scheTemp.START_TIME.Date == scheTemp.END_TIME.Date && scheTemp.START_TIME == scheTemp.START_TIME.Date))//跨天 + { + exist = noticeExsiss.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == userInfo.DEPARTMENT_ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME >= startTime && (t.CREATE_TIME.Value.Date == scheTemp.START_TIME.Date || t.CREATE_TIME.Value.Date == scheTemp.START_TIME.Date.AddDays(-1))); + } + } } } 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))