diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index fcae5fc1..01d8d7dd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -912,6 +912,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemService.listByIds(Arrays.asList(s)); @@ -919,7 +923,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listMsg = new ArrayList<>(); if(!CollectionUtils.isEmpty(list)){ List listStr = list.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); - List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.listByIds(listStr); + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,listStr); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); List listPayContactsManagementTemporary = new ArrayList<>(); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ List listContacts = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); @@ -943,6 +949,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl{ + // 收费通知为合同的,不进行变更,其他方式直接变更 + if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + return; + } LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); // 变更应收金额,重新校验状态 ProjectStatusVO projectStatusVO = projectDetailService.getStatus(p.getId(),input.getReceivableAmount(),p.getNeedInvoice()); @@ -981,7 +991,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listIds = listNew.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); // 发消息 项目负责人发给企业联系人、工作组联系人 List listContacts = finalListPayContactsManagementTemporary.stream().filter(item->listIds.contains(item.getId())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContacts)) { + if(CollectionUtils.isEmpty(listContacts)) { return; } listContacts.forEach(m->{ @@ -1007,8 +1017,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl