From 92ba3f9e9a66853ceac8e66d9fc4f2897f169e93 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Mon, 8 May 2023 19:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=BC=E7=8F=AD=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=AF=B9=E5=BA=94=E7=B1=BB=E5=9E=8B=E5=92=8C=E6=8E=92?=
 =?UTF-8?q?=E7=8F=ADbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyMainServiceImpl.java  |  2 +-
 .../operational/duty/service/impl/ImsDutyRecServiceImpl.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index bed2691..48feda9 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -467,7 +467,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 						if (ObjectUtil.isNotEmpty(split)) {
 							for (String dutyGroupId : split) {
 								//查询班组信息
-								Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
+								Long num = Long.valueOf(StringUtils.isNotEmpty(dutyGroupId) ? dutyGroupId : "0");
 								List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
 								List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
 								if (CollectionUtil.isNotEmpty(collectPerson)) {
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 8a6221e..d8cc5ae 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
@@ -958,7 +958,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
     private void remondingStationV2(User admin, String userName, ImsDutyClassEntity
             classEntity, String tenantId, Long taskId, Long createDept, Long createUser) {
         MessagePushRecordDto messagePushRecordDto = new MessagePushRecordDto();
-        messagePushRecordDto.setBusinessClassify(MessageConstants.BusinessClassifyEnum.DUTY.getKey());
+        messagePushRecordDto.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal());
         messagePushRecordDto.setBusinessKey(MessageConstants.BusinessClassifyEnum.DUTY.getKey());
         messagePushRecordDto.setSubject(MessageConstants.BusinessClassifyEnum.DUTY.getDescription());
         messagePushRecordDto.setTaskId(taskId);
@@ -987,7 +987,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
     private void remondingHead(PushExtrasReq req, int type, Long managerId, String tenantId, Long createDept, Long createUser) {
         req.setTitle("交接班");
         req.setType(DutyRecProcessConstant.MESSAGE_CLASS_TYPE_DUTY_REC);
-        req.setBusinessClassify(DutyRecProcessConstant.MESSAGE_CLASS_DAY);
+        req.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal());
         if (type == OperationalConstants.RecTypeEnum.HAND_REMIND.getVal()) {
             req.setPushAlert("您距离本次值班结束时间只剩 15 分钟，请尽快进行交班工作");
         } else if (type == OperationalConstants.RecTypeEnum.HAND_DELAY.getVal()) {
@@ -1002,7 +1002,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
      */
     private void remondingHeadV2(int type, Long managerId, String userName, String tenantId, Long createDept, Long taskId, Long createUser) {
         MessagePushRecordDto messagePushRecordDto = new MessagePushRecordDto();
-        messagePushRecordDto.setBusinessClassify("dailyRemind");
+        messagePushRecordDto.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal());
         messagePushRecordDto.setBusinessKey(MessageConstants.BusinessClassifyEnum.DUTY.getKey());
         messagePushRecordDto.setSubject(MessageConstants.BusinessClassifyEnum.DUTY.getDescription());
         messagePushRecordDto.setTaskId(taskId);
@@ -1032,7 +1032,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             classEntity, String date, String tenantId, Long createDept, Long createUser) {
         req.setTitle("交接班");
         req.setType(DutyRecProcessConstant.MESSAGE_CLASS_TYPE_DUTY_REC);
-        req.setBusinessClassify(DutyRecProcessConstant.MESSAGE_CLASS_DAY);
+        req.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal());
         if (type == OperationalConstants.RecTypeEnum.HAND_REMIND.getVal()) {
             req.setPushAlert(userName + " 于 " + date + " 时已提交交班工作");
         } else if (type == OperationalConstants.RecTypeEnum.HAND_DELAY.getVal()) {
@@ -1049,7 +1049,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
     private void remondingCarryV2(int type, Long managerId, String userName, ImsDutyClassEntity
             classEntity, String date, String tenantId, Long createDept, Long taskId, Long createUser) {
         MessagePushRecordDto messagePushRecordDto = new MessagePushRecordDto();
-        messagePushRecordDto.setBusinessClassify("dailyRemind");
+        messagePushRecordDto.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal());
         messagePushRecordDto.setBusinessKey(MessageConstants.BusinessClassifyEnum.DUTY.getKey());
         messagePushRecordDto.setSubject(MessageConstants.BusinessClassifyEnum.DUTY.getDescription());
         messagePushRecordDto.setTaskId(taskId);