合同计量单元最高支付比例

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

@@ -78,5 +78,7 @@ public class InventoryFormMeter extends BaseEntity {
     @ApiModelProperty(value = "变更后施工图金额")
     private BigDecimal changeBuildPictureMoney;
 
+    @ApiModelProperty(value = "最高支付比例")
+    private Integer upPayRatio;
 
 }

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

@@ -92,4 +92,7 @@ public class MeterTreeContract extends BaseEntity {
     @ApiModelProperty(value = "是否锁定节点 0=否 1=是")
     private Integer isLock;
 
+    @ApiModelProperty(value = "最高支付比例")
+    private Integer upPayRatio;
+
 }

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

@@ -107,4 +107,7 @@ public class ContractFromVO {
 
     @ApiModelProperty(value = "引用状态,0未引用，1引用,被引用的施工图不允许修改删除")
     private Integer citeStatus;
+
+    @ApiModelProperty(value = "最高支付比例")
+    private Integer upPayRatio;
 }

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

@@ -143,7 +143,7 @@
           and cif.id not in (SELECT contract_form_id from s_inventory_form_meter WHERE contract_id = #{contractId} and contract_meter_id = #{meterId} and is_deleted = 0)
     </select>
     <select id="getNodeResolveForm" resultType="org.springblade.meter.vo.ContractFromVO">
-        select ifm.id, ifm.contract_form_id ,cif.form_number,cif.form_name,cif.current_price,cif.contract_total,cif.change_total,cif.is_supplement,
+        select ifm.id, ifm.contract_form_id ,cif.form_number,cif.form_name,cif.current_price,cif.contract_total,cif.change_total,cif.is_supplement,ifm.up_pay_ratio as upPayRatio,
                ifm.build_picture_total,ifm.change_build_picture_total,ifm.build_picture_money,ifm.change_build_picture_money,
 
                if(ifm.build_picture_total=ifm.change_build_picture_total,if((select count(1) from s_inventory_form_apply

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/InventoryFormMeterServiceImpl.java

@@ -65,6 +65,11 @@ public class InventoryFormMeterServiceImpl extends BaseServiceImpl<InventoryForm
     @Override
     public R inventoryFormMeterService(String meterId, String formIds) {
         List<Long> longList = Func.toLongList(formIds);
+        //查询节点最大支付比例
+        MeterTreeContract meter = meterTreeContractService.getById(meterId);
+        if (meter == null){
+            throw new ServiceException("未找到当前合同计量节点");
+        }
         for(Long forid:longList){
             InventoryFormMeter inventoryFormMeter = baseMapper.selectOne(Wrappers.<InventoryFormMeter>query().lambda()
                     .eq(InventoryFormMeter::getContractMeterId, meterId)
@@ -80,6 +85,7 @@ public class InventoryFormMeterServiceImpl extends BaseServiceImpl<InventoryForm
                 data.setChangeBuildPictureTotal(BigDecimal.ZERO);
                 data.setBuildPictureMoney(BigDecimal.ZERO);
                 data.setChangeBuildPictureMoney(BigDecimal.ZERO);
+                data.setUpPayRatio(meter.getUpPayRatio());
                 baseMapper.insert(data);
             }
         }
@@ -112,6 +118,7 @@ public class InventoryFormMeterServiceImpl extends BaseServiceImpl<InventoryForm
                        .set(InventoryFormMeter::getChangeBuildPictureTotal,vo.getChangeBuildPictureTotal())
                        .set(InventoryFormMeter::getBuildPictureMoney,vo.getBuildPictureMoney())
                        .set(InventoryFormMeter::getChangeBuildPictureMoney,vo.getChangeBuildPictureMoney())
+                       .set(InventoryFormMeter::getUpPayRatio,vo.getUpPayRatio())
                );
             }
         }