From ac9473999172fc2426e093ce88754381734cd60a 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 10:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/controller/PayIncomeContractController.java    | 4 ++++
 .../jero/project/controller/PayCommonProjectController.java | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
index 0c062ad5..3c0b6b90 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
@@ -43,6 +43,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -388,6 +389,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		 if(payIncomeContract==null) {
 			 return Result.error("未找到对应数据");
 		 }
+		 if(Objects.isNull(payIncomeContract.getContractAmount())){
+			 payIncomeContract.setContractAmount(new BigDecimal("0.00"));
+		 }
 		 String str = JSON.toJSONString(payIncomeContract);
 		 PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class);
 		 // 获取关联项目id
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 25d38137..dd092a16 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
@@ -423,6 +423,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		 }
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
+		 if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){
+			 payCompanyCommonProject.setPaidAmount(new BigDecimal("0.00"));
+		 }
+		 if(Objects.isNull(payCompanyCommonProject.getReceivableAmount())){
+			 payCompanyCommonProject.setReceivableAmount(new BigDecimal("0.00"));
+		 }
 
 		 // 合同编号查找合同id
 		 if(!StringUtils.isBlank(payCommonProject.getContractNum())){