Browse Source

计量-合同材料属性带小数的,根据实际值显示小数长度,允许修改为空

qianxb 6 months ago
parent
commit
0895ee5f4e

+ 19 - 5
blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/ContractMaterial.java

@@ -79,15 +79,19 @@ public class ContractMaterial extends BaseEntity {
     private BigDecimal price;
 
     @ApiModelProperty(value = "材料损耗率")
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private BigDecimal wastageRatio;
 
     @ApiModelProperty(value = "调差限额百分比")
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private BigDecimal quotaRatio;
 
     @ApiModelProperty(value = "业主收益/承担百分比")
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private BigDecimal ownerRatio;
 
     @ApiModelProperty(value = "材料总和抵扣率")
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     private BigDecimal deductionRatio;
 
     public BigDecimal getPrice() {
@@ -99,7 +103,9 @@ public class ContractMaterial extends BaseEntity {
     }
 
     public void setPrice(BigDecimal price) {
-        this.price = new BigDecimal(price.stripTrailingZeros().toPlainString());
+        if (price != null){
+            this.price = new BigDecimal(price.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getWastageRatio() {
@@ -111,7 +117,9 @@ public class ContractMaterial extends BaseEntity {
     }
 
     public void setWastageRatio(BigDecimal wastageRatio) {
-        this.wastageRatio = new BigDecimal(wastageRatio.stripTrailingZeros().toPlainString());
+        if (wastageRatio != null){
+            this.wastageRatio = new BigDecimal(wastageRatio.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getQuotaRatio() {
@@ -123,7 +131,9 @@ public class ContractMaterial extends BaseEntity {
     }
 
     public void setQuotaRatio(BigDecimal quotaRatio) {
-        this.quotaRatio = new BigDecimal(quotaRatio.stripTrailingZeros().toPlainString());
+        if (quotaRatio != null) {
+            this.quotaRatio = new BigDecimal(quotaRatio.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getOwnerRatio() {
@@ -135,7 +145,9 @@ public class ContractMaterial extends BaseEntity {
     }
 
     public void setOwnerRatio(BigDecimal ownerRatio) {
-        this.ownerRatio = new BigDecimal(ownerRatio.stripTrailingZeros().toPlainString());
+        if (ownerRatio != null) {
+            this.ownerRatio = new BigDecimal(ownerRatio.stripTrailingZeros().toPlainString());
+        }
     }
 
     public BigDecimal getDeductionRatio() {
@@ -147,6 +159,8 @@ public class ContractMaterial extends BaseEntity {
     }
 
     public void setDeductionRatio(BigDecimal deductionRatio) {
-        this.deductionRatio = new BigDecimal(deductionRatio.stripTrailingZeros().toPlainString());
+        if (deductionRatio != null) {
+            this.deductionRatio = new BigDecimal(deductionRatio.stripTrailingZeros().toPlainString());
+        }
     }
 }