Merge remote-tracking branch 'origin/master' into master

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

@@ -140,5 +140,8 @@ public class MaterialMeterForm extends BaseEntity {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
+    @ApiModelProperty(value = "合同规定预付款金额")
+    private BigDecimal contractStatedMoney;
+
 
 }

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

@@ -34,7 +34,8 @@ import java.math.BigDecimal;
 public class ContractMaterialVO extends ContractMaterial {
 	private static final long serialVersionUID = 1L;
 
-
+	@ApiModelProperty(value = "材料-预付款比例")
+	private BigDecimal clPrepaymentRatio;
 	public String getNodeName() {
 		return getMaterialName();
 	}

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

@@ -23,7 +23,8 @@
     <select id="getALLMaterial" resultType="org.springblade.meter.vo.ContractMaterialVO">
         select *,false as hasChild,
             (case when material_number is null then material_name when material_number = '' then material_name
-                ELSE concat(material_name, '[',material_number,']') end) as nodeName
+                ELSE concat(material_name, '[',material_number,']') end) as nodeName,
+            (select cl_prepayment_ratio from s_meter_contract_info where is_deleted = 0 and contract_id = #{contractId}) as clPrepaymentRatio
         from s_contract_material where is_deleted = 0 and contract_id = #{contractId}
     </select>
     <select id="page2" resultType="org.springblade.meter.vo.ContractMaterialVO2">