|
@@ -19,10 +19,7 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
-import java.util.Comparator;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -116,7 +113,7 @@ public class TwinEmpCalcController extends BaseController {
|
|
|
*/
|
|
|
private BigDecimal calculateTotalPrice(List<TwinEmpCalc> group) {
|
|
|
return group.stream()
|
|
|
- .map(TwinEmpCalc::getTotalPrice)
|
|
|
+ .map(TwinEmpCalc::getTotalPrice).filter(Objects::nonNull)
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
}
|
|
|
|