瀏覽代碼

计量单元支付比例可以为空,清单支付比例为空,并按条件设置值

qianxb 1 年之前
父節點
當前提交
61fe17ca88

+ 3 - 1
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -628,7 +628,9 @@ public class MeterTreeController extends BladeController {
         }
         if (ObjectUtil.isNotEmpty(dto.getDecompositionList()) && dto.getDecompositionList().size() > 0) {
             //校验比例是否在范围之内
-            if (dto.getUpPayRatio() == null || dto.getUpPayRatio().compareTo(BigDecimal.ZERO) < 0 || dto.getUpPayRatio().compareTo(new BigDecimal("100")) > 0){
+            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("修改失败,请检查支付比例是否在规定范围");
             }
             /*最底层节点修改*/

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

@@ -101,15 +101,14 @@ public class InventoryFormMeterServiceImpl extends BaseServiceImpl<InventoryForm
             if (vo.getBuildPictureTotal() == null){
                 throw new ServiceException("请填写施工图数量");
             }
-            if (vo.getUpPayRatio() == null){
-                throw new ServiceException("请填写最高支付比例");
-            }
             //校验当前节点下当前清单,是否在变更令中变更,或计量中计量
             if (vo.getCiteStatus() == 0 && formIsChange(meterId,vo.getContractFormId())){
                 throw new ServiceException("清单["+vo.getFormName()+"]已经变更或计量,请刷新页面");
             }
             //校验比例是否在范围之内
-            if (vo.getUpPayRatio() == null || vo.getUpPayRatio().compareTo(BigDecimal.ZERO) < 0 || vo.getUpPayRatio().compareTo(new BigDecimal("100")) > 0){
+            if (vo.getUpPayRatio() == null){
+                vo.setUpPayRatio(upPayRatio);
+            }else if (vo.getUpPayRatio().compareTo(BigDecimal.ZERO) < 0 || vo.getUpPayRatio().compareTo(new BigDecimal("100")) > 0){
                 throw new ServiceException("修改失败,请检查支付比例是否在规定范围");
             }
             if (vo.getCiteStatus() == 0){