|
@@ -141,14 +141,13 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
|
|
map.put("total", 1);
|
|
map.put("total", 1);
|
|
map.put("length", item.get("changeNum"));
|
|
map.put("length", item.get("changeNum"));
|
|
|
|
|
|
-
|
|
+
|
|
- BigDecimal measureAreaItem = ((BigDecimal) item.get("changeNum"))
|
|
+ map.put("measureArea", ((BigDecimal) item.get("changeNum"))
|
|
.multiply(BigDecimal.valueOf((float) item.get("materialWidth")))
|
|
.multiply(BigDecimal.valueOf((float) item.get("materialWidth")))
|
|
- .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
|
|
+ .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
|
|
-
|
|
+
|
|
- map.put("measureArea", measureAreaItem);
|
|
+ map.put("money", ((BigDecimal) item.get("changeNum")).multiply((BigDecimal) item.get("materialPrice"))
|
|
- map.put("money", measureAreaItem.multiply((BigDecimal) item.get("materialPrice"))
|
|
+ .setScale(2, RoundingMode.HALF_UP));
|
|
- .setScale(2, RoundingMode.HALF_UP));
|
|
|
|
return map;
|
|
return map;
|
|
},
|
|
},
|
|
(v1, v2) -> {
|
|
(v1, v2) -> {
|