|
@@ -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){
|