通知消息发送调整；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java

@@ -108,6 +108,8 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     List<EntrustSampleItem> getListByEntrustId(Long entrustId);
 
+    List<Long> getTesterIdListByEntrustId(Long entrustId);
+
     boolean revokeRemovedItem(Long[] ids);
 
     Page<EntrustSampleItemVO> getItemFillProgressQuery(Page<EntrustSampleItemVO> page, EntrustSampleItemVO itemVO);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -1327,6 +1327,12 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     }
 
     @Override
+    public List<Long> getTesterIdListByEntrustId(Long entrustId) {
+        List<EntrustSampleItem> sampleItems = getListByEntrustId(entrustId);
+        return CollectionUtils.isEmpty(sampleItems) ? null : sampleItems.stream().map(EntrustSampleItem::getTesterId).collect(Collectors.toList());
+    }
+
+    @Override
     public boolean revokeRemovedItem(Long[] ids) {
         if (null == ids) {
             throw new PatznException("检测项目编号为空");

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/UserInfoServiceImpl.java

@@ -11,10 +11,10 @@ import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
 import com.patzn.cloud.service.base.entity.SysOrg;
 import com.patzn.cloud.service.base.entity.SysUser;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
-import com.patzn.cloud.service.hmhj.enums.MessageUserEnum;
 import com.patzn.cloud.service.lims.base.entity.LmsUserGroup;
 import com.patzn.cloud.service.lims.base.vo.GroupUserVO;
 import com.patzn.cloud.service.lims.common.consts.Symbol;
+import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +51,9 @@ public class UserInfoServiceImpl {
     @Autowired
     private SysRoleClient sysRoleClient;
 
+    @Autowired
+    private ILmsMsgService lmsMsgService;
+
     public List<LmsUserGroup> getGroupList(Long userId) {
         if (null == userId) {
             return OTHER_GROUP_LIST;
@@ -97,6 +100,19 @@ public class UserInfoServiceImpl {
         return Stream.of(userIdStr.split(Symbol.COMMA)).map(Long::valueOf).distinct().collect(Collectors.toList());
     }
 
+    public List<Long> getUserIdsByGroupName(String groupName) {
+        if (StringUtils.isBlank(groupName)) {
+            return null;
+        }
+        Account account = LoginHelper.getAccount();
+        List<GroupUserVO> groupUserList = lmsUserGroupClient.getGroupUserIdsList(account.getCompanyId()).serviceData();
+        if (CollectionUtils.isEmpty(groupUserList)) {
+            return null;
+        }
+        String userIdStr = groupUserList.stream().filter(t -> t.getGroupName().equals(groupName)).map(GroupUserVO::getUserIds).collect(Collectors.joining(Symbol.COMMA));
+        return Stream.of(userIdStr.split(Symbol.COMMA)).map(Long::valueOf).distinct().collect(Collectors.toList());
+    }
+
     public boolean isGroupLeader(Long entrustId, Account account) {
         if (null == entrustId) {
             return false;
@@ -139,16 +155,4 @@ public class UserInfoServiceImpl {
         return getUserById(LoginHelper.getAccount().getUserId());
     }
 
-    public List<Long> getUserIds(MessageUserEnum messageUserEnum, Long someoneId) {
-        List<Long> userIdList = new ArrayList<>();
-        if (MessageUserEnum.CURRENT == messageUserEnum) {
-            userIdList.add(LoginHelper.getAccount().getUserId());
-        } else if (MessageUserEnum.SOMEONE == messageUserEnum) {
-            userIdList.add(someoneId);
-        } else {
-            userIdList.addAll(getGroupUserIds(null));
-        }
-        return userIdList;
-    }
-
 }