Ver código fonte

利润结算表BUG修复

caozj 1 ano atrás
pai
commit
4c20720556

+ 1 - 1
hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -589,7 +589,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
         BigDecimal totalExpensesSumAmount = BigDecimal.ZERO;
         BigDecimal grossProfitMargin = BigDecimal.ZERO;
         for (ProfitSettlementVo p : list) {
-            contractSumAmount = contractSumAmount.add(ObjectUtil.isEmpty(p.getContractAmount())?BigDecimal.ZERO:p.getContractAmount());//合同金额
+            contractSumAmount = contractSumAmount.add(ObjectUtil.isEmpty(p.getContractAmount())?BigDecimal.ZERO:p.getContractAmount().multiply(p.getRate()));//合同金额
             contractArrivalSumAmount = contractArrivalSumAmount.add(ObjectUtil.isEmpty(p.getContractArrival())?BigDecimal.ZERO:p.getContractArrival());//合同到账
             taxReturnMoneySumAmount = taxReturnMoneySumAmount.add(ObjectUtil.isEmpty(p.getTaxReturnMoney())?BigDecimal.ZERO:p.getTaxReturnMoney());//退税
             otherIncomeSumAmount = otherIncomeSumAmount.add(ObjectUtil.isEmpty(p.getOtherIncome())?BigDecimal.ZERO:p.getOtherIncome());//其他收入