...
|
...
|
@@ -126,11 +126,11 @@ public class AssetsService { |
|
|
}
|
|
|
Integer key = (Integer)tmpMap.get("tradeType");
|
|
|
if(TradeType.goods_income.getCode()==key){
|
|
|
sum_goods_income.add((BigDecimal)tmpMap.get("allAmount"));
|
|
|
sum_goods_income = sum_goods_income.add((BigDecimal)tmpMap.get("allAmount"));
|
|
|
}
|
|
|
|
|
|
if(TradeType.compensateIncome.getCode()==key){
|
|
|
compensate_income.add((BigDecimal)tmpMap.get("allAmount"));
|
|
|
compensate_income = compensate_income.add((BigDecimal)tmpMap.get("allAmount"));
|
|
|
}
|
|
|
|
|
|
}
|
...
|
...
|
@@ -145,11 +145,11 @@ public class AssetsService { |
|
|
}
|
|
|
Integer key = (Integer)tmpMap.get("tradeType");
|
|
|
if(TradeType.goods_income.getCode()==key){
|
|
|
sum_goods_income.subtract((BigDecimal)tmpMap.get("allAmount"));
|
|
|
sum_goods_income = sum_goods_income.subtract((BigDecimal)tmpMap.get("allAmount"));
|
|
|
}
|
|
|
|
|
|
if(TradeType.compensateIncome.getCode()==key){
|
|
|
compensate_income.subtract((BigDecimal)tmpMap.get("allAmount"));
|
|
|
compensate_income = compensate_income.subtract((BigDecimal)tmpMap.get("allAmount"));
|
|
|
}
|
|
|
|
|
|
}
|
...
|
...
|
|