|
@@ -341,7 +341,15 @@ public class TSeapriceServiceImpl implements ITSeapriceService
|
|
|
map.put("amt", oceanAmt.add(otherAmt).divide(new BigDecimal(tSeaprice.getfQty()),2,BigDecimal.ROUND_HALF_UP));
|
|
|
/*BigDecimal amt = oceanAmt.multiply(new BigDecimal(tSeaprice.getfQty())).add(tSeaprice.getExrate().multiply(new BigDecimal(tSeaprice.getfQty()))).add(otherAmt);
|
|
|
map.put("amt", amt.divide(new BigDecimal(tSeaprice.getfQty()),2,BigDecimal.ROUND_HALF_UP));*/
|
|
|
- map.put("fleet", tSeapriceMapper.selectSeapriceItem(tSeaprice));
|
|
|
+ List<Map<String,Object>> mapList = tSeapriceMapper.selectSeapriceItem(tSeaprice);
|
|
|
+ List<Map<String,Object>> newMap = new ArrayList<>();
|
|
|
+ for (Map<String,Object> ma:mapList) {
|
|
|
+ if (!ma.get("fUnitprice").equals(0.0)){
|
|
|
+ newMap.add(ma);
|
|
|
+ }
|
|
|
+ }
|
|
|
+// map.put("fleet", tSeapriceMapper.selectSeapriceItem(tSeaprice));
|
|
|
+ map.put("fleet", newMap);
|
|
|
return AjaxResult.success(map);
|
|
|
}
|
|
|
|