From b19032e3d4d818f1299a6f409b615c7db466e541 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 28 Apr 2025 18:30:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(REQ-3982)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=B7=E6=AC=BE=E5=AE=A1=E6=89=B9=E7=9A=84=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 0a428540..5dd60cc7 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 @@ -1523,10 +1523,10 @@ public class ChangeRecordServiceImpl extends ServiceImpl= 0, "金额变化超出范围"); } // 关联单据合法性 - validRelationOrder(req.getRelationOrderMap(), req.getRelationWorkspaceId(), req.getType()); + validRelationOrder(req.getRelationOrderMap(), req.getRelationWorkspaceId(), req.getType(), visaRecord.getId()); } - private void validRelationOrder(Map> relationOrderMap, Long workspaceId, VisaTypeEnum type) { + private void validRelationOrder(Map> relationOrderMap, Long workspaceId, VisaTypeEnum type, Long visaId) { if (CollUtil.isNotEmpty(relationOrderMap)) { relationOrderMap.forEach((key, value) -> { if (CollectionUtils.isNotEmpty(value)) { @@ -1548,7 +1548,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl taskOrders = taskOrderApiGateway.pageOrderByForBasic(queryOrderToBasicReq).getData(); AssertUtil.isTrue(CollectionUtils.isNotEmpty(taskOrders) && taskOrders.size() == taskNos.size(), "关联任务单单据不存在，请检查后重试"); - validTaskBillIfRelated(taskNos, type); + validTaskBillIfRelated(taskNos, type, visaId); } } else if (Objects.equals(VisaBillTypeEnum.RECTIFY.name(), key)) { /*整改单*/ @@ -1563,7 +1563,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl rectifyOrders = rectifyApiGateway.listRectifyOrders(rectifyOrderReq); AssertUtil.isTrue(CollectionUtils.isNotEmpty(rectifyOrders) && rectifyOrders.size() == billIds.size(), "关联整改单单据不存在，请检查后重试"); - validBillIfRelated(VisaBillTypeEnum.RECTIFY, billIds, type); + validBillIfRelated(VisaBillTypeEnum.RECTIFY, billIds, type, visaId); } } else if (Objects.equals(VisaBillTypeEnum.DESIGN_VISA.name(), key)) { /*变更单*/ @@ -1580,7 +1580,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl value, VisaTypeEnum visaType) { + private void validBillIfRelated(VisaBillTypeEnum billType, List value, VisaTypeEnum visaType, Long visaId) { AssertUtil.notNull(billType, "关联单据类型不能为空"); AssertUtil.notEmpty(value, "关联单据Id不能为空"); AssertUtil.notNull(visaType, "单据类型不能为空"); List mainBill = changeRecordBillService.getRelatedMainBill(billType, value); mainBill.stream() + .filter(i -> !Objects.equals(visaId, i.getVisaId())) .collect(Collectors.groupingBy(ChangeRecordBill::getBillId)) .forEach((k, v) -> v.stream() .filter(m -> Objects.equals(m.getVisaType(), visaType)) @@ -1614,7 +1615,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl taskNos, VisaTypeEnum visaType) { + private void validTaskBillIfRelated(List taskNos, VisaTypeEnum visaType, Long visaId) { AssertUtil.notEmpty(taskNos, "关联单据Id不能为空"); AssertUtil.notNull(visaType, "单据类型不能为空"); List mainBill = changeRecordBillService.getRelatedMainBill(VisaBillTypeEnum.TASK, taskNos); @@ -1622,6 +1623,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl !Objects.equals(visaId, i.getVisaId())) .collect(Collectors.groupingBy(ChangeRecordBill::getBillNo)) .forEach((k, v) -> v.stream() .filter(m -> Objects.equals(m.getVisaType(), visaType)) @@ -2182,7 +2184,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl checkResults = Lists.newArrayList(PROCESSING, APPROVED); boolean checkResult = StringUtils.hasText(visa.getApprovalIdPay()) && checkResults.contains(BpmnProcessInstanceResultEnum.valueOfStatus(visa.getApprovalStatusPay())); From 80ed816c81a2356e1a08755536dd42adbb9fc3a9 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 28 Apr 2025 20:20:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(REQ-3982)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=B7=E6=AC=BE=E5=AE=A1=E6=89=B9=E7=9A=84=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c8f3d37d..ffa21a36 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 @@ -1523,7 +1523,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl= 0, "金额变化超出范围"); } // 关联单据合法性 - validRelationOrder(req.getRelationOrderMap(), req.getRelationWorkspaceId(), req.getType(), visaRecord.getId()); + validRelationOrder(req.getRelationOrderMap(), req.getRelationWorkspaceId(), req.getType(), req.getId()); } private void validRelationOrder(Map> relationOrderMap, Long workspaceId, VisaTypeEnum type, Long visaId) { From 479c3025229acf3a949180909a29589a112e621a Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 28 Apr 2025 20:23:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(REQ-3982)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=B7=E6=AC=BE=E5=AE=A1=E6=89=B9=E7=9A=84=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 ffa21a36..3ff238e0 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 @@ -2138,6 +2138,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl