From 0101561d125ad1962913b6dcb9339351a8607763 Mon Sep 17 00:00:00 2001 From: PengJ <2413927716@qq.com> Date: Tue, 11 Nov 2025 18:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90im=E3=80=91=E5=A4=9A=E6=96=B9=E9=80=9A?= =?UTF-8?q?=E8=AF=9D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emergency/entity/dto/AddOtherMemberDTO.java | 7 ------- .../api/controller/EmergencyOrderApiController.java | 4 ++-- .../api/service/EmergencyOrderApiService.java | 2 +- .../api/service/impl/EmergencyApiServiceImpl.java | 12 ++++++++++-- .../service/impl/EmergencyOrderApiServiceImpl.java | 10 ++++++---- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/AddOtherMemberDTO.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/AddOtherMemberDTO.java index 86e7499..ac550ed 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/AddOtherMemberDTO.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/AddOtherMemberDTO.java @@ -26,13 +26,6 @@ public class AddOtherMemberDTO { @Schema(title = "群组id") private String groupId; - /** - * 应急单id - */ - @NotBlank(message = "应急单id不能为空") - @Schema(title = "应急单id") - private String orderId; - /** * 邀请成员id集合 */ diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/controller/EmergencyOrderApiController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/controller/EmergencyOrderApiController.java index b97702e..8a26530 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/controller/EmergencyOrderApiController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/controller/EmergencyOrderApiController.java @@ -292,8 +292,8 @@ public class EmergencyOrderApiController { */ @Operation(summary = "获取群组成员和其他专业人员") @GetMapping("/getGroupMemberList") - public Result> getGroupMemberList(@RequestParam("orderId") String orderId) { - return Result.OK(emergencyOrderApiService.getGroupMemberList(orderId)); + public Result> getGroupMemberList(@RequestParam("sessionId") String sessionId) { + return Result.OK(emergencyOrderApiService.getGroupMemberList(sessionId)); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java index e7032af..77ba1f8 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java @@ -72,6 +72,6 @@ public interface EmergencyOrderApiService { List getSicknessTypeStatistic(String sex, String depart); - List getGroupMemberList(String orderId); + List getGroupMemberList(String sessionId); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java index bd6e77a..843832d 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java @@ -1070,16 +1070,24 @@ public class EmergencyApiServiceImpl implements EmergencyApiService { @Transactional(rollbackFor = Exception.class) @Override public boolean addGroupUser(AddOtherMemberDTO dto) { + String groupId = dto.getGroupId(); + Order order = orderMapper.selectOne(new LambdaQueryWrapper() + .eq(Order::getSessionId, groupId) + ); + if (order == null) { + ExceptionAssertsUtil.fail("应急单不存在"); + } + String orderId = order.getId(); dto.getMemberList().forEach(userId -> { OrderOperator orderOperator = orderOperatorMapper.selectOne(new LambdaQueryWrapper() - .eq(OrderOperator::getOrderId, dto.getOrderId()) + .eq(OrderOperator::getOrderId, orderId) .eq(OrderOperator::getUserId, userId) ); if (orderOperator != null) { return; } orderOperator = new OrderOperator(); - orderOperator.setOrderId(dto.getOrderId()); + orderOperator.setOrderId(orderId); orderOperator.setOperatorType(1); orderOperator.setUserId(userId); orderOperator.setJoinType(1); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java index 48e44b4..38198f9 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java @@ -584,20 +584,22 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { /** * 获取群组成员和其他专业人员 * - * @param orderId + * @param sessionId * @return */ @Override - public List getGroupMemberList(String orderId) { + public List getGroupMemberList(String sessionId) { List groupMemberVos = new ArrayList<>(); LoginUser loginUser = GlobalUtils.getLoginUser(); // 校验订单是否存在 - Order order = orderMapper.selectById(orderId); + Order order = orderMapper.selectOne(new LambdaQueryWrapper() + .eq(Order::getSessionId, sessionId) + ); if (order == null) { ExceptionAssertsUtil.fail("应急单不存在"); } - + String orderId = order.getId(); // 添加发起人信息 handleGroupMember(groupMemberVos, orderId, order.getInitiatorUserId(),