From b027f488f894bca316da810351b8d58a3398f388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 11 Oct 2021 11:32:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupSubItemController.java | 11 +++++++++++ .../jero/project/entity/PayWorkingGroupSubItem.java | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index d1bfaf7a..1138b76c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -220,6 +220,13 @@ public class PayWorkingGroupSubItemController extends JeroController pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew); if(!CollectionUtils.isEmpty(pageList.getRecords())){ List list = pageList.getRecords(); + List listIds = list.stream().map(PayWorkingGroupSubItem::getWorkingGroupId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayWorkingGroup = new LambdaQueryWrapper<>(); + queryPayWorkingGroup.in(PayWorkingGroup::getId,listIds); + List listPayWorkingGroup = payWorkingGroupService.list(queryPayWorkingGroup); + if(CollectionUtils.isEmpty(listPayWorkingGroup)){ + return Result.error("工作组不存在"); + } list.forEach(p->{ if(Objects.isNull(p.getReceivableAmount())){ p.setReceivableAmount(new BigDecimal("0.00")); @@ -227,6 +234,10 @@ public class PayWorkingGroupSubItemController extends JeroController listPrincipalIdA = listPayWorkingGroup.stream().filter(item->Objects.equals(item.getId(),p.getWorkingGroupId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listPrincipalIdA)){ + p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA()); + } }); pageList.setRecords(list); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index db4a72ff..3f7e6b05 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -215,4 +215,10 @@ public class PayWorkingGroupSubItem implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "来款状态") private String chargeStatus; + /** + * 负责人 + */ + @TableField(exist = false) + @ApiModelProperty(value = "负责人") + private String principalName; }