From ef691c2d530fcbc792dae27c1d3a551124173519 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, 10 Jun 2026 10:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=8E=92=E7=8F=AD=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E5=B2=97=E4=BD=8D=E5=BD=93=E7=8F=AD=EF=BC=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=BA=A4=E6=8E=A5=E7=8F=AD=E5=AD=97=E6=AE=B5=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E4=BB=8E=E6=8E=92=E7=8F=AD=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=B8=A6=E8=BF=87=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APT.PP.WebApi/Controllers/Api/FOController.cs    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
index 7b4b865..1439864 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
@@ -706,10 +706,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                 var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList();
                                 var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList();
 
-
+                                var is_handover = false;
                                 //判断is_handover,true的话记录下个班班组的id
                                 if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER)
                                 {
+                                    is_handover = true;
                                     var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID);
                                     if (nextClassTemp != null)
                                     {
@@ -756,6 +757,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                         currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID;
                                         currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常;
                                         currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
+                                        currentClassRecord.IS_HANDOVER = is_handover;
                                         listRecord.Add(currentClassRecord);
                                         foreach (var post in postUsers)
                                         {
@@ -822,10 +824,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                 var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList();
                                 var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList();
 
-
+                                var is_handover = false;
                                 //判断is_handover,true的话记录下个班班组的id
                                 if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER)
-                                {
+                                {
+                                    is_handover = true;
                                     var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID);
                                     if (nextClassTemp != null)
                                     {
@@ -871,7 +874,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                         currentClassRecord.NEXT_CLASS_TEAM_ID = nextClassID;
                                         currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID;
                                         currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常;
-                                        currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
+                                        currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
+                                        currentClassRecord.IS_HANDOVER = is_handover;
                                         listRecord.Add(currentClassRecord);
                                         foreach (var post in postUsers)
                                         {