From 15a79f8bbb5d7a0ec16d0dd478d867800a1e7476 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 7 Jun 2023 16:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E6=B6=88=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=91=E7=BB=99=E7=AB=99?=
 =?UTF-8?q?=E9=95=BF=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=98=AF?=
 =?UTF-8?q?admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duty/service/impl/ImsDutyRecServiceImpl.java   | 26 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 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 d9ea6ec..c436f19 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
@@ -645,8 +645,16 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                                 //如果延迟的时间差超过1分钟到15分钟
                             } else if (differMinute>OperationalConstants.MessageRecTypeEnum.DELAYED_HAND_REC_MESSAGE.getVal()&&differMinute<OperationalConstants.MessageRecTypeEnum.DELAYED_HAND_REC_MESSAGE_LAST.getVal()) {//延时交班提醒
                                 //提醒站长    接班人   交班人
-//                                User admin = userClient.userByAccount(entity.getTenantId(), "admin").getData();
-//                                remondingStationV2(carryMainentity.getDutyDate(),admin, userName, classEntity, carryMainentity.getTenantId(), carryMainentity.getId(), carryMainentity.getCreateDept(), carryMainentity.getCreateUser());//提醒站长
+                                R<List<User>> stationAgent = userClient.relationUserListByRoleAlias(entity.getTenantId(), entity.getCreateDept(), "stationAgent");
+                                //提醒站长
+                                if (stationAgent.isSuccess()){
+                                    List<User> data = stationAgent.getData();
+                                    if (CollectionUtil.isNotEmpty(data)){
+                                        for (User admin : data) {
+                                            remondingStationV2(carryMainentity.getDutyDate(),admin, userName, classEntity, carryMainentity.getTenantId(), carryMainentity.getId(), carryMainentity.getCreateDept(), carryMainentity.getCreateUser());//提醒站长
+                                        }
+                                    }
+                                }
                                 remondingCarryV2(carryMainentity.getDutyDate(),OperationalConstants.RecTypeEnum.HAND_DELAY.getVal(), carryManagerId, userName, classEntity, null, carryTenantId, carryCreateDept, carryMainentity.getId(), carryMainentity.getCreateUser());//提醒接班人
                                 remondingHeadV2(carryMainentity.getDutyDate(),OperationalConstants.RecTypeEnum.HAND_DELAY.getVal(), groupEntityManagerId, userName, entity.getTenantId(), entity.getCreateDept(), entity.getId(), entity.getCreateUser());//提醒交班人
                             }
@@ -655,8 +663,16 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                             Long differMinute = DateUtils.getDifferMinute(calculateDate(carryMainentity, carryClassEntity, OperationalConstants.DutyRecTypeEnum.CARRY_REC.getVal()));
                             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());//提醒站长
+                                R<List<User>> stationAgent = userClient.relationUserListByRoleAlias(entity.getTenantId(), entity.getCreateDept(), "stationAgent");
+                                //提醒站长
+                                if (stationAgent.isSuccess()){
+                                    List<User> data = stationAgent.getData();
+                                    if (CollectionUtil.isNotEmpty(data)){
+                                        for (User admin : data) {
+                                            remondingStationV2(carryMainentity.getDutyDate(),admin, userName, classEntity, carryMainentity.getTenantId(), carryMainentity.getId(), carryMainentity.getCreateDept(), carryMainentity.getCreateUser());
+                                        }
+                                    }
+                                }
                                 remondingCarryV2(carryMainentity.getDutyDate(),2, carryManagerId, user.getData().getName(), classEntity, null, carryTenantId, carryCreateDept, carryMainentity.getId(), carryMainentity.getCreateUser());//提醒接班人
                             }
                         }
@@ -975,7 +991,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         messagePushRecordDto.setTaskId(taskId);
         messagePushRecordDto.setTenantId(tenantId);
         messagePushRecordDto.setPusher(admin.getId().toString());
-        messagePushRecordDto.setPusherName(userName);
+        messagePushRecordDto.setPusherName(admin.getName());
         messagePushRecordDto.setAccount(admin.getId().toString());
         messagePushRecordDto.setContent(userName + " 负责人"+datyTime+ " 的值班，时间段为：(" + classEntity.getStartTime()
                 + "-" + classEntity.getEndTime() + ")  目前已交班延迟,请尽快联系该负责人进行交班工作");