|
@@ -404,13 +404,13 @@ public class ProjectBudgetController extends BaseController {
|
|
BigDecimal supervisorCostDecimal = bigDecimal1.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal supervisorCostDecimal = bigDecimal1.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
//设计合同折扣
|
|
//设计合同折扣
|
|
BigDecimal bigDecimal2 = new BigDecimal(designContractDiscount);
|
|
BigDecimal bigDecimal2 = new BigDecimal(designContractDiscount);
|
|
- BigDecimal desConDecimal = bigDecimal2.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
+ BigDecimal desConDecimal = bigDecimal2.setScale(4, BigDecimal.ROUND_HALF_UP);
|
|
//设计典设折扣
|
|
//设计典设折扣
|
|
BigDecimal bigDecimal3 = new BigDecimal(designTypicalDiscount);
|
|
BigDecimal bigDecimal3 = new BigDecimal(designTypicalDiscount);
|
|
- BigDecimal desTypeDecimal = bigDecimal3.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
+ BigDecimal desTypeDecimal = bigDecimal3.setScale(4, BigDecimal.ROUND_HALF_UP);
|
|
//监理费合同折扣
|
|
//监理费合同折扣
|
|
BigDecimal bigDecimal4 = new BigDecimal(supervisorContractDiscount);
|
|
BigDecimal bigDecimal4 = new BigDecimal(supervisorContractDiscount);
|
|
- BigDecimal supervisorDecimal = bigDecimal4.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
+ BigDecimal supervisorDecimal = bigDecimal4.setScale(4, BigDecimal.ROUND_HALF_UP);
|
|
//计算项目设计费应付金额(设计费*设计合同折扣*设计典设折扣*1.06)两位小数
|
|
//计算项目设计费应付金额(设计费*设计合同折扣*设计典设折扣*1.06)两位小数
|
|
BigDecimal firResult = designCostDecimal.multiply(desConDecimal).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal firResult = designCostDecimal.multiply(desConDecimal).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal secResult = firResult.multiply(desTypeDecimal).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal secResult = firResult.multiply(desTypeDecimal).setScale(2, BigDecimal.ROUND_HALF_UP);
|