diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 1ff24f48..de14ea4d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -1,5 +1,6 @@ package com.jero.project.controller; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -30,6 +31,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.entity.PayCommonProject; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -94,6 +96,18 @@ public class PayCommonProjectController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + if(Objects.isNull(p.getReceivableAmount())){ + p.setReceivableAmount(new BigDecimal("0.00")); + } + if(Objects.isNull(p.getPaidAmount())){ + p.setPaidAmount(new BigDecimal("0.00")); + } + }); + pageList.setRecords(list); + } return Result.OK(pageList); } @@ -175,6 +189,12 @@ public class PayCommonProjectController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + if(Objects.isNull(p.getReceivableAmount())){ + p.setReceivableAmount(new BigDecimal("0.00")); + } + if(Objects.isNull(p.getPaidAmount())){ + p.setPaidAmount(new BigDecimal("0.00")); + } + }); + } return Result.OK(pageList); }