Skip to content

C
cloud-fb
Commit bc981882 by shiwenbo
Options

校验逻辑增加非空判断

parent 11131e25
Showing with 1 additions and 1 deletions
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
...@@ -459,7 +459,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{ ...@@ -459,7 +459,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
KObject oldSalesPlanDetail = oldSalesPlanDetails.stream().filter(detail -> detail.get("dinasType").getUuid("id").equals(dinasTypeId) && detail.get("contract").getUuid("id").equals(contractId)).findAny().orElse(null); KObject oldSalesPlanDetail = oldSalesPlanDetails.stream().filter(detail -> detail.get("dinasType").getUuid("id").equals(dinasTypeId) && detail.get("contract").getUuid("id").equals(contractId)).findAny().orElse(null);
if (oldSalesPlanDetail != null) { //合同与砂石类型共同筛选 if (oldSalesPlanDetail != null) { //合同与砂石类型共同筛选
totalSalesPlanAmount = totalSalesPlanAmount.add(oldSalesPlanDetail.getBigDecimal("planAmount")); totalSalesPlanAmount = totalSalesPlanAmount.add(oldSalesPlanDetail.getBigDecimal("planAmount"));
actualSaleTotalAmount = actualSaleTotalAmount.add(oldSalesPlanDetail.getBigDecimal("actualSaleAmount")); actualSaleTotalAmount = actualSaleTotalAmount.add(oldSalesPlanDetail.getBigDecimal("actualSaleAmount") != null ? oldSalesPlanDetail.getBigDecimal("actualSaleAmount") : new BigDecimal("0"));
} }
//} //}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment