|
@@ -843,7 +843,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
if (v.getGross().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
v.setGrossRate(BigDecimal.ZERO);
|
|
|
} else {
|
|
|
- v.setGrossRate(v.getGross().divide(v.getIncomeAmount(), RoundingMode.CEILING).multiply(new BigDecimal("100")));
|
|
|
+ BigDecimal grossRate = BigDecimal.ZERO;
|
|
|
+ if (v.getIncomeAmount().compareTo(BigDecimal.ZERO) != 0) {
|
|
|
+ v.getGross().divide(v.getIncomeAmount(), RoundingMode.CEILING).multiply(new BigDecimal("100"));
|
|
|
+ }
|
|
|
+ v.setGrossRate(grossRate);
|
|
|
}
|
|
|
}
|
|
|
return page;
|
|
@@ -1986,7 +1990,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
|
|
|
for (AccountRequestFundsDetailVo c : list) {
|
|
|
String costType = c.getCostType() == null ? "" : c.getCostType();
|
|
|
- BigDecimal rate = c.getRate();
|
|
|
+ BigDecimal rate = c.getRate() == null ? BigDecimal.ONE : c.getRate();
|
|
|
switch (costType) {
|
|
|
case "0"://拖车费
|
|
|
trailerFee = trailerFee.add(c.getAmount().multiply(rate));
|