From 5c69a5b55c53dfed717ad8855a389846e9d6b858 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Wed, 26 Feb 2025 16:52:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-3300):=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordServiceImpl.java | 91 +++++++++++-------- 1 file changed, 52 insertions(+), 39 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 67e5dcf5..e87aa0e0 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -655,6 +655,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl buildVisaBillDto(VisaChangeTempCreateReq req, ChangeRecord changeRecord) { return req.getRelationOrderMap().entrySet().stream() + .peek(os -> { + if (VisaBillTypeEnum.TASK.name().equals(os.getKey())) { + os.setValue(os.getValue().stream().filter(o -> StringUtils.hasText(o.getNo())).collect(Collectors.toList())); + } else { + os.setValue(os.getValue().stream().filter(o -> NumberUtil.isPositiveNumber(o.getId())).collect(Collectors.toList())); + } + }) .flatMap(os -> os.getValue().stream() .map(o -> VisaBillDto.builder() .visaId(changeRecord.getId()) @@ -1919,53 +1926,59 @@ public class ChangeRecordServiceImpl extends ServiceImpl taskOrderMap = taskOrderApiGateway.pageOrderByForBasic(queryOrderToBasicReq).getData() - .stream() - .collect(Collectors.toMap(TaskOrderToBasicRes::getTaskNo, Function.identity())); - // 构建关联任务单 - relationOrderMap.put(k, v.stream() - .map(item -> VisaChangeTempCreateReq.OrderSimpleModel.builder() - .id(item.getBillId()) - .no(item.getBillNo()) - .name(Optional.ofNullable(taskOrderMap.get(item.getBillNo())) - .map(TaskOrderToBasicRes::getTaskName) - .orElse("")) - .build()) - .collect(Collectors.toList())); + List orderData = taskOrderApiGateway.pageOrderByForBasic(queryOrderToBasicReq).getData(); + if (CollUtil.isNotEmpty(orderData)) { + Map taskOrderMap = orderData.stream() + .collect(Collectors.toMap(TaskOrderToBasicRes::getTaskNo, Function.identity())); + // 构建关联任务单 + relationOrderMap.put(k, v.stream() + .map(item -> VisaChangeTempCreateReq.OrderSimpleModel.builder() + .id(item.getBillId()) + .no(item.getBillNo()) + .name(Optional.ofNullable(taskOrderMap.get(item.getBillNo())) + .map(TaskOrderToBasicRes::getTaskName) + .orElse("")) + .build()) + .collect(Collectors.toList())); + } } else if (VisaBillTypeEnum.RECTIFY.name().equals(k)) { // 获取整改单数据 ListRectifyOrderReq rectifyOrderReq = ListRectifyOrderReq.builder() .ids(v.stream().map(ChangeRecordBill::getBillId).collect(Collectors.toSet())) .build(); - Map rectifyOrderMap = rectifyApiGateway.listRectifyOrders(rectifyOrderReq) - .stream() - .collect(Collectors.toMap(RectifyOrderResp::getId, Function.identity(), (v1, v2) -> v1)); - // 构建关联整改单 - relationOrderMap.put(k, v.stream() - .map(item -> VisaChangeTempCreateReq.OrderSimpleModel.builder() - .id(item.getBillId()) - .no(item.getBillNo()) - .name(Optional.ofNullable(rectifyOrderMap.get(item.getBillId())) - .map(RectifyOrderResp::getBizName) - .orElse("")) - .build()) - .collect(Collectors.toList())); + List rectifyData = rectifyApiGateway.listRectifyOrders(rectifyOrderReq); + if (CollUtil.isNotEmpty(rectifyData)) { + Map rectifyOrderMap = rectifyData.stream() + .collect(Collectors.toMap(RectifyOrderResp::getId, Function.identity(), (v1, v2) -> v1)); + // 构建关联整改单 + relationOrderMap.put(k, v.stream() + .map(item -> VisaChangeTempCreateReq.OrderSimpleModel.builder() + .id(item.getBillId()) + .no(item.getBillNo()) + .name(Optional.ofNullable(rectifyOrderMap.get(item.getBillId())) + .map(RectifyOrderResp::getBizName) + .orElse("")) + .build()) + .collect(Collectors.toList())); + } } else if (VisaBillTypeEnum.DESIGN_VISA.name().equals(k)) { // 获取设计单数据 - Map changeRecordMap = listByIds(v.stream().map(ChangeRecordBill::getBillId).collect(Collectors.toSet())) - .stream() + List visaDesignData = listByIds(v.stream().map(ChangeRecordBill::getBillId).collect(Collectors.toSet())); + Map changeRecordMap = visaDesignData.stream() .collect(Collectors.toMap(ChangeRecord::getId, Function.identity(), (v1, v2) -> v1)); - // 构建关联设计单 - relationOrderMap.put(k, v.stream() - .map(item -> VisaChangeTempCreateReq.OrderSimpleModel.builder() - .id(item.getBillId()) - .no(item.getBillNo()) - .name(Optional.ofNullable(changeRecordMap.get(item.getBillId())) - .map(ChangeRecord::getTopic) - .orElse("")) - .build()) - .collect(Collectors.toList()) - ); + if (CollUtil.isNotEmpty(visaDesignData)) { + // 构建关联设计单 + relationOrderMap.put(k, v.stream() + .map(item -> VisaChangeTempCreateReq.OrderSimpleModel.builder() + .id(item.getBillId()) + .no(item.getBillNo()) + .name(Optional.ofNullable(changeRecordMap.get(item.getBillId())) + .map(ChangeRecord::getTopic) + .orElse("")) + .build()) + .collect(Collectors.toList()) + ); + } } }); req.setRelationOrderMap(relationOrderMap); From 378f0b6bf01c5c8d05180ef32d1cdcca05254da2 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 26 Feb 2025 16:55:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A2=9E=E5=8A=A0=20visaId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/mq/listener/im/ImGroupAddMembersEventHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java index 5e70d8aa..a9e38e7a 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java @@ -87,6 +87,7 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing notice.setBizEventMappingCode(refreshableConfiguration.getImGroupAddMemberNoticeEventCode()); notice.setBizCode(String.valueOf(visaId)); notice.setBizExtParams(new JSONObject(Maps.of( + "visaId", visaId, "initiatorName", ownerProfile.getRealName(), "visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "", "topic", group.getName())));