|
|
@@ -943,7 +943,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
List<TChangeTaskOut> list = selectChangeTask(t.getId());
|
|
|
BigDecimal count=new BigDecimal(0);
|
|
|
for (TChangeTaskOut tt : list) {
|
|
|
- if(tt.getType()!=3)count=count.add(tt.getCommodityPrice());
|
|
|
+ if(tt.getType()!=null&&tt.getType()!=3)count=count.add(tt.getCommodityPrice());
|
|
|
}
|
|
|
if (amout.compareTo(count)!=0) {
|
|
|
throw new BusinessException("项目金额总和不等于合同总金额。");
|
|
|
@@ -952,7 +952,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
count=new BigDecimal(0);
|
|
|
for (TChangeDunOut td : list2) {
|
|
|
if(td.getMoney()==null)td.setMoney(new BigDecimal(0));
|
|
|
- if(td.getType()!=3)count=count.add(td.getMoney());
|
|
|
+ if(td.getType()!=null&&td.getType()!=3)count=count.add(td.getMoney());
|
|
|
}
|
|
|
if (amout.compareTo(count)!=0) {
|
|
|
throw new BusinessException("收款节点金额总和不等于合同总金额。");
|