LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业端工作组修改

Browse Source
This commit is contained in:
梁琦涛
2021-10-11 11:32:32 +08:00
parent 9ff336b933
commit b027f488f8
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+11
View File
@@ -220,6 +220,13 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew);
if(!CollectionUtils.isEmpty(pageList.getRecords())){
List<PayWorkingGroupSubItem> list = pageList.getRecords();
List<String> listIds = list.stream().map(PayWorkingGroupSubItem::getWorkingGroupId).collect(Collectors.toList());
LambdaQueryWrapper<PayWorkingGroup> queryPayWorkingGroup = new LambdaQueryWrapper<>();
queryPayWorkingGroup.in(PayWorkingGroup::getId,listIds);
List<PayWorkingGroup> 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<PayWorkingG
if(Objects.isNull(p.getPaidAmount())){
p.setPaidAmount(new BigDecimal("0.00"));
}
List<PayWorkingGroup> 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);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+6
View File
@@ -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;
}