diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 310aeec0..21dd76f0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -265,9 +265,30 @@ public class PayIncomeContractController extends JeroController getAssociated(@RequestParam("contractId") String contractId) { - List list = payIncomeContractService.getAssociated(contractId); - if(!CollectionUtils.isEmpty(list)){ - list.forEach(p->{ + PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId); + if(payIncomeContract==null) { + return Result.error("未找到对应数据"); + } + List listProject = new ArrayList<>(); + // 获取关联项目id + if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){ + LambdaQueryWrapper queryPayIncomeContractAssociatedCancellation = new LambdaQueryWrapper(); + queryPayIncomeContractAssociatedCancellation.eq(PayIncomeContractAssociatedCancellation::getContractId,payIncomeContract.getId()); + List listPayIncomeContractAssociatedCancellation = payIncomeContractAssociatedCancellationService.list(queryPayIncomeContractAssociatedCancellation); + if(!CollectionUtils.isEmpty(listPayIncomeContractAssociatedCancellation)){ + List finalListProject = listProject; + listPayIncomeContractAssociatedCancellation.forEach(p->{ + String s = JSON.toJSONString(p); + ProjectOutput projectOutput = JSONObject.parseObject(s,ProjectOutput.class); + projectOutput.setId(p.getAssociatedId()); + finalListProject.add(projectOutput); + }); + } + }else{ + listProject = payIncomeContractService.getAssociated(contractId); + } + if(!CollectionUtils.isEmpty(listProject)){ + listProject.forEach(p->{ if(!Objects.isNull(p.getChargeUse())){ p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",String.valueOf(p.getChargeUse()))); } @@ -279,7 +300,7 @@ public class PayIncomeContractController extends JeroController