From 2a213ed616ce9ca2348054243fcacb45e7dbb79f Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 23 Oct 2023 17:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/gov/convert/ProjectConvert.java          | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
index 9f0a55a..9230a62 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
@@ -219,10 +219,10 @@ public class ProjectConvert {
         req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile());
         req.setAreaCode(approve.getAreaCode());
         req.setBaseDevelopCode(approve.getBaseDevelopCode());
-        req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney()));
-        req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney()));
-        req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney()));
-        req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney()));
+        req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null);
+        req.setBaseExpertYearMoney(Objects.nonNull(approve.getBaseExpertYearMoney()) ? String.valueOf(approve.getBaseExpertYearMoney()) : null);
+        req.setReleaseYearMoney(Objects.nonNull(approve.getReleaseYearMoney()) ? String.valueOf(approve.getReleaseYearMoney()) : null);
+        req.setBaseInitialReviewTotalMoney(Objects.nonNull(approve.getBaseInitialReviewTotalMoney()) ? String.valueOf(approve.getBaseInitialReviewTotalMoney()) : null);
         req.setBaseReviewOpinion(approve.getBaseReviewOpinion());
         req.setBaseReviewResults(approve.getBaseReviewResults());
         req.setEqualProtectionLevel(approve.getEqualProtectionLevel());
@@ -244,10 +244,10 @@ public class ProjectConvert {
         req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile());
         req.setAreaCode(approve.getAreaCode());
         req.setBaseDevelopCode(approve.getBaseDevelopCode());
-        req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney()));
-        req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney()));
-        req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney()));
-        req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney()));
+        req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null);
+        req.setBaseExpertYearMoney(Objects.nonNull(approve.getBaseExpertYearMoney()) ? String.valueOf(approve.getBaseExpertYearMoney()) : null);
+        req.setReleaseYearMoney(Objects.nonNull(approve.getReleaseYearMoney()) ? String.valueOf(approve.getReleaseYearMoney()) : null);
+        req.setBaseInitialReviewTotalMoney(Objects.nonNull(approve.getBaseInitialReviewTotalMoney()) ? String.valueOf(approve.getBaseInitialReviewTotalMoney()) : null);
         req.setBaseReviewOpinion(approve.getBaseReviewOpinion());
         req.setBaseReviewResults(approve.getBaseReviewResults());
         req.setEqualProtectionLevel(approve.getEqualProtectionLevel());
@@ -272,10 +272,10 @@ public class ProjectConvert {
                 approve.getPreliminaryDesignFile());
         req.setAreaCode(approve.getAreaCode());
         req.setBaseDevelopCode(approve.getBaseDevelopCode());
-        req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney()));
-        req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney()));
-        req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney()));
-        req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney()));
+        req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null);
+        req.setBaseExpertYearMoney(Objects.nonNull(approve.getBaseExpertYearMoney()) ? String.valueOf(approve.getBaseExpertYearMoney()) : null);
+        req.setReleaseYearMoney(Objects.nonNull(approve.getReleaseYearMoney()) ? String.valueOf(approve.getReleaseYearMoney()) : null);
+        req.setBaseInitialReviewTotalMoney(Objects.nonNull(approve.getBaseInitialReviewTotalMoney()) ? String.valueOf(approve.getBaseInitialReviewTotalMoney()) : null);
         req.setBaseReviewOpinion(approve.getBaseReviewOpinion());
         req.setBaseReviewResults(approve.getBaseReviewResults());
         req.setEqualProtectionLevel(approve.getEqualProtectionLevel());