From 3e2447eac70329b2dfd1dcd8332d395650d61415 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, 21 Apr 2026 17:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=80=9A=E7=9F=A5=E6=9C=89?= =?UTF-8?q?=E6=8E=92=E7=8F=AD=E7=8F=AD=E7=BB=84=E9=87=8D=E5=A4=8D=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.PP.WebApi/Controllers/Api/SKController.cs | 10 ++++++++-- 1 file changed, 8 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 b69180e..5ae3b23 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5422,7 +5422,8 @@ namespace APT.PP.WebApi.Controllers.Api DateTime minTime = dt.AddMinutes(0); DateTime maxTime = dt.AddMinutes(60); - var shiftClassList = this.GetEntities(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").ToList(); + var shiftClassAll = this.GetEntities(s => s.DATE_TIME.Date == dt.Date && s.START_TIME != s.END_TIME && 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).ToList(); var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList(); var teamInfos = this.GetEntities(t => teamIds.Contains(t.ID), new BaseFilter(filter.OrgId)); var teamDepartIds = teamInfos.Select(m => m.DEPARTMENT_ID).Distinct().ToList(); @@ -5589,7 +5590,12 @@ namespace APT.PP.WebApi.Controllers.Api } else { - send = false; + //查今天所有的排班班组，当前班组是否在里面，在里面说明有排班，有排班时间未到，则不触发 + var scheTemp = shiftClassAll.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID); + if (scheTemp == null) + { + send = false; + } } } 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))