计量-合同材料小数格式，材料调差状态为合同计量期实时状态

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

@@ -90,4 +90,63 @@ public class ContractMaterial extends BaseEntity {
     @ApiModelProperty(value = "材料总和抵扣率")
     private BigDecimal deductionRatio;
 
+    public BigDecimal getPrice() {
+        if (price == null){
+            return null;
+        }else {
+            return new BigDecimal(price.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = new BigDecimal(price.stripTrailingZeros().toPlainString());
+    }
+
+    public BigDecimal getWastageRatio() {
+        if (wastageRatio == null){
+            return null;
+        }else {
+            return new BigDecimal(wastageRatio.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setWastageRatio(BigDecimal wastageRatio) {
+        this.wastageRatio = new BigDecimal(wastageRatio.stripTrailingZeros().toPlainString());
+    }
+
+    public BigDecimal getQuotaRatio() {
+        if (quotaRatio == null){
+            return null;
+        }else {
+            return new BigDecimal(quotaRatio.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setQuotaRatio(BigDecimal quotaRatio) {
+        this.quotaRatio = new BigDecimal(quotaRatio.stripTrailingZeros().toPlainString());
+    }
+
+    public BigDecimal getOwnerRatio() {
+        if (ownerRatio == null){
+            return null;
+        }else {
+            return new BigDecimal(ownerRatio.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setOwnerRatio(BigDecimal ownerRatio) {
+        this.ownerRatio = new BigDecimal(ownerRatio.stripTrailingZeros().toPlainString());
+    }
+
+    public BigDecimal getDeductionRatio() {
+        if (deductionRatio == null){
+            return null;
+        }else {
+            return new BigDecimal(deductionRatio.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setDeductionRatio(BigDecimal deductionRatio) {
+        this.deductionRatio = new BigDecimal(deductionRatio.stripTrailingZeros().toPlainString());
+    }
 }

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

@@ -110,6 +110,7 @@ public class ContractMaterialAdjust extends BaseEntity {
     @ApiModelProperty(value = "调差计算式")
     private String adjustCalculation;
 
+    //因为计量期审批通过之后可以随意撤回，目前此字段毫无意义，审批状态取合同计量期实时状态
     @ApiModelProperty(value = "审批状态:0未完成1已完成（此处根据计量期状态）")
     private Integer approveStatus;
 

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

@@ -58,4 +58,15 @@ public class ContractMaterialPrice extends BaseEntity {
     @ApiModelProperty(value = "实时单价")
     private BigDecimal currentPrice;
 
+    public BigDecimal getCurrentPrice() {
+        if (currentPrice == null){
+            return null;
+        }else {
+            return new BigDecimal(currentPrice.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setCurrentPrice(BigDecimal currentPrice) {
+        this.currentPrice =  new BigDecimal(currentPrice.stripTrailingZeros().toPlainString());
+    }
 }

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

@@ -26,7 +26,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
- * 合同材料表实体类
+ * 材料价格有效期表实体类
  *
  * @author BladeX
  * @since 2023-11-29

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/ContractMaterialVO3.java

@@ -48,4 +48,15 @@ public class ContractMaterialVO3 {
 	@ApiModelProperty(value = "单价")
 	private BigDecimal price;
 
+	public BigDecimal getPrice() {
+		if (price == null){
+			return null;
+		}else {
+			return new BigDecimal(price.stripTrailingZeros().toPlainString());
+		}
+	}
+
+	public void setPrice(BigDecimal price) {
+		this.price = new BigDecimal(price.stripTrailingZeros().toPlainString());
+	}
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ContractMaterialAdjustMapper.xml

@@ -17,8 +17,10 @@
         </foreach>
     </select>
     <select id="page2" resultType="org.springblade.meter.vo.ContractMaterialAdjustVO">
-        select *,if(approve_status = 0,'未完成','已完成') as approveStatusName
-        from s_contract_material_adjust
+        select *,
+               (select approve_status from s_contract_meter_period scmp
+                        where scmp.id = scma.meter_period_id)as approveStatus
+        from s_contract_material_adjust scma
         where contract_id = #{dto.contractId} and is_deleted = 0
         <if test="dto.contractPeriodId != null and dto.contractPeriodId != ''">
             and contract_period_id = #{dto.contractPeriodId}