计量-合同材料相关小数格式

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/ContractMaterialAdjust.java

@@ -126,7 +126,9 @@ public class ContractMaterialAdjust extends BaseEntity {
     }
 
     public void setCurrentPrice(BigDecimal currentPrice) {
-        this.currentPrice = new BigDecimal(currentPrice.stripTrailingZeros().toPlainString());
+        if (currentPrice != null) {
+            this.currentPrice = new BigDecimal(currentPrice.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getMaterialPrice() {
@@ -138,7 +140,9 @@ public class ContractMaterialAdjust extends BaseEntity {
     }
 
     public void setMaterialPrice(BigDecimal materialPrice) {
-        this.materialPrice = new BigDecimal(materialPrice.stripTrailingZeros().toPlainString());
+        if (materialPrice != null) {
+            this.materialPrice = new BigDecimal(materialPrice.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getRangePriceRatio() {
@@ -150,7 +154,9 @@ public class ContractMaterialAdjust extends BaseEntity {
     }
 
     public void setRangePriceRatio(BigDecimal rangePriceRatio) {
-        this.rangePriceRatio = new BigDecimal(rangePriceRatio.stripTrailingZeros().toPlainString());
+        if (rangePriceRatio != null) {
+            this.rangePriceRatio = new BigDecimal(rangePriceRatio.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getAdjustTotal() {
@@ -162,7 +168,9 @@ public class ContractMaterialAdjust extends BaseEntity {
     }
 
     public void setAdjustTotal(BigDecimal adjustTotal) {
-        this.adjustTotal = new BigDecimal(adjustTotal.stripTrailingZeros().toPlainString());
+        if (adjustTotal != null) {
+            this.adjustTotal = new BigDecimal(adjustTotal.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getAdjustMoney() {
@@ -174,6 +182,8 @@ public class ContractMaterialAdjust extends BaseEntity {
     }
 
     public void setAdjustMoney(BigDecimal adjustMoney) {
-        this.adjustMoney =  new BigDecimal(adjustMoney.stripTrailingZeros().toPlainString());
+        if (adjustMoney != null) {
+            this.adjustMoney = new BigDecimal(adjustMoney.stripTrailingZeros().toPlainString());
+        }
     }
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/ContractMaterialAdjustDetail.java

@@ -91,7 +91,9 @@ public class ContractMaterialAdjustDetail extends BaseEntity {
     }
 
     public void setChangeTotal(BigDecimal changeTotal) {
-        this.changeTotal = new BigDecimal(changeTotal.stripTrailingZeros().toPlainString());
+        if (changeTotal != null) {
+            this.changeTotal = new BigDecimal(changeTotal.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getAdjustFactor() {
@@ -103,7 +105,9 @@ public class ContractMaterialAdjustDetail extends BaseEntity {
     }
 
     public void setAdjustFactor(BigDecimal adjustFactor) {
-        this.adjustFactor = new BigDecimal(adjustFactor.stripTrailingZeros().toPlainString());
+        if (adjustFactor != null) {
+            this.adjustFactor = new BigDecimal(adjustFactor.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getMeterTotal() {
@@ -115,7 +119,9 @@ public class ContractMaterialAdjustDetail extends BaseEntity {
     }
 
     public void setMeterTotal(BigDecimal meterTotal) {
-        this.meterTotal = new BigDecimal(meterTotal.stripTrailingZeros().toPlainString());
+        if (meterTotal != null) {
+            this.meterTotal = new BigDecimal(meterTotal.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getAdjustTotal() {
@@ -127,6 +133,8 @@ public class ContractMaterialAdjustDetail extends BaseEntity {
     }
 
     public void setAdjustTotal(BigDecimal adjustTotal) {
-        this.adjustTotal =  new BigDecimal(adjustTotal.stripTrailingZeros().toPlainString());
+        if (adjustTotal != null) {
+            this.adjustTotal = new BigDecimal(adjustTotal.stripTrailingZeros().toPlainString());
+        }
     }
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/ContractMaterialPrice.java

@@ -67,6 +67,8 @@ public class ContractMaterialPrice extends BaseEntity {
     }
 
     public void setCurrentPrice(BigDecimal currentPrice) {
-        this.currentPrice =  new BigDecimal(currentPrice.stripTrailingZeros().toPlainString());
+        if (currentPrice != null) {
+            this.currentPrice = new BigDecimal(currentPrice.stripTrailingZeros().toPlainString());
+        }
     }
 }