Преглед на файлове

合同计量单元不设置默认比例,并且允许删除

qianxb преди 1 година
родител
ревизия
120e46ecf9

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

@@ -1,5 +1,7 @@
 package org.springblade.meter.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -93,6 +95,7 @@ public class MeterTreeContract extends BaseEntity {
     private Integer isLock;
 
     @ApiModelProperty(value = "最高支付比例")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private BigDecimal upPayRatio;
 
     @ApiModelProperty(value = "是否自动计量1是0否")

+ 0 - 1
blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeContractServiceImpl.java

@@ -2201,7 +2201,6 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
         }
         //校验比例是否在范围之内
         if (dto.getUpPayRatio() == null){
-            dto.setUpPayRatio(new BigDecimal(80));
         }else if (dto.getUpPayRatio().compareTo(BigDecimal.ZERO) < 0 || dto.getUpPayRatio().compareTo(new BigDecimal("100")) > 0){
             throw new ServiceException("请检查支付比例是否在规定范围");
         }