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 BaseServiceImplOperationalConstants.MessageRecTypeEnum.DELAYED_HAND_REC_MESSAGE.getVal()&&differMinute> stationAgent = userClient.relationUserListByRoleAlias(entity.getTenantId(), entity.getCreateDept(), "stationAgent"); + //提醒站长 + if (stationAgent.isSuccess()){ + List 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 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> stationAgent = userClient.relationUserListByRoleAlias(entity.getTenantId(), entity.getCreateDept(), "stationAgent"); + //提醒站长 + if (stationAgent.isSuccess()){ + List 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