|
@@ -167,7 +167,7 @@ public class ContractMaterialValidityServiceImpl extends BaseServiceImpl<Contrac
|
|
|
str.append("调差公式(标准):调增金额＝调差数量×[市场价－基准价×(1+风险幅度差%)]×(1+合同增值税税率)\n");
|
|
str.append("调差公式(标准):调增金额＝调差数量×[市场价－基准价×(1+风险幅度差%)]×(1+合同增值税税率)\n");
|
|
|
}
|
|
}
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- BigDecimal decimal = currentPrice.subtract(price).multiply(new BigDecimal(100)).divide(currentPrice, 2, RoundingMode.DOWN);
|
|
|
|
|
|
|
+ BigDecimal decimal = currentPrice.subtract(price).multiply(new BigDecimal(100)).divide(price, 2, RoundingMode.DOWN);
|
|
|
map.put("rangePriceRatio",decimal);
|
|
map.put("rangePriceRatio",decimal);
|
|
|
map.put("adjustCalculation",str.toString());
|
|
map.put("adjustCalculation",str.toString());
|
|
|
if (decimal.compareTo(quotaRatio.negate()) == 1 && decimal.compareTo(quotaRatio) == -1){
|
|
if (decimal.compareTo(quotaRatio.negate()) == 1 && decimal.compareTo(quotaRatio) == -1){
|
qianxb