From 90aa46c375fc022d0d2666bff3feace38da18888 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, 27 Sep 2021 14:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCommonProjectController.java           | 20 +++++++++++++++++++
 .../PayWorkingGroupSubItemController.java     | 12 +++++++++++
 2 files changed, 32 insertions(+)

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<PayCommonProject,
 		}
 		Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
 		IPage<PayCommonProject> pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate);
+		if(!CollectionUtils.isEmpty(pageList.getRecords())){
+			List<PayCommonProject> 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<PayCommonProject,
 				if(!Objects.isNull(p.getChargeUse())){
 					p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",String.valueOf(p.getChargeUse())));
 				}
+				if(Objects.isNull(p.getReceivableAmount())){
+					p.setReceivableAmount(new BigDecimal("0.00"));
+				}
+				if(Objects.isNull(p.getPaidAmount())){
+					p.setPaidAmount(new BigDecimal("0.00"));
+				}
 				listPayCommonProjectOutputNew.add(p);
 			});
 		}
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 c06e8659..ff0e5f79 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
@@ -1,5 +1,6 @@
 package com.jero.project.controller;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -80,6 +81,17 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 }
 		 Page<PayWorkingGroupSubItem> page = new Page<>(pageNo, pageSize);
 		 IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate);
+		 if(!CollectionUtils.isEmpty(pageList.getRecords())){
+		 	List<PayWorkingGroupSubItem> 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);
 	 }