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