From 262131a9cb64b38b412b39712bf56f3ca09d7347 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 10 May 2023 11:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=BC=E7=8F=ADbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyRecServiceImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index 1e0bcb3..a60e1fa 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -319,8 +319,14 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             return imsDutyRecVOIPage;
         }
         for (ImsDutyRecVO imsDutyRecVO : records) {
-            ImsSchedulingVo imsSchedulingVo = imsDutyMainMapper.selectByIdOneV2(imsDutyRecVO.getDutyId(), null);
-            imsDutyRecVO.setCarryDutyMainVo(imsDutyMainMapper.selectByPreDutyIdOne(Optional.ofNullable(imsSchedulingVo).map(ImsSchedulingVo::getId).orElse(null)));
+            ImsSchedulingVo imsSchedulingVo = imsDutyMainService.getByIdOneV2(imsDutyRecVO.getDutyId(), null);
+            ImsSchedulingVo carryDutyMainVo = imsDutyMainMapper.selectByPreDutyIdOne(Optional.ofNullable(imsSchedulingVo).map(ImsSchedulingVo::getId).orElse(null));
+            if (ObjectUtil.isNotEmpty(carryDutyMainVo)){
+                if (StringUtil.isNotBlank(carryDutyMainVo.getGroupName())){
+                    carryDutyMainVo.setGroupName("临时班组");
+                }
+            }
+            imsDutyRecVO.setCarryDutyMainVo(carryDutyMainVo);
             if (ObjectUtil.isEmpty(imsDutyRecVO)) {
                 continue;
             }
@@ -645,7 +651,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                         } else {//已发起接班流程  判断是否提醒接班
                             ImsDutyClassEntity carryClassEntity = imsDutyClassService.getById(carryMainentity.getClassId());
                             Long differMinute = DateUtils.getDifferMinute(calculateDate(carryMainentity, carryClassEntity, OperationalConstants.DutyRecTypeEnum.CARRY_REC.getVal()));
-                            if (differMinute > 0 && one.getDelayStatus() == 0) {
+                            if (differMinute > 0 && one.getDelayStatus() == 0&&differMinute < 15) {
                                 //提醒站长    接班人   交班人
                                 User admin = userClient.userByAccount(entity.getTenantId(), "admin").getData();
                                 remondingStationV2(carryMainentity.getDutyDate(),admin, admin.getName(), classEntity, carryMainentity.getTenantId(), carryMainentity.getId(), carryMainentity.getCreateDept(), carryMainentity.getCreateUser());//提醒站长