Commit ea12d1d3e655031660e41bbfbd83503d5fa1f318
1 parent
8ace6ab2
feat: 问题修复项
1、内部编号处理 '-' 通过接口刷数据处理 2、计算利润率支持全选(根据页面查询条件) 3、计算设计师权重分母对内部编码去重
Showing
1 changed file
with
2 additions
and
1 deletions
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; | @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; | ||
22 | 22 | ||
23 | import javax.annotation.Resource; | 23 | import javax.annotation.Resource; |
24 | import java.math.BigDecimal; | 24 | import java.math.BigDecimal; |
25 | +import java.math.RoundingMode; | ||
25 | import java.util.List; | 26 | import java.util.List; |
26 | import java.util.Objects; | 27 | import java.util.Objects; |
27 | import java.util.Set; | 28 | import java.util.Set; |
@@ -90,7 +91,7 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl<OrderCompletio | @@ -90,7 +91,7 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl<OrderCompletio | ||
90 | } | 91 | } |
91 | } | 92 | } |
92 | Set<String> innerNoSet = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).collect(Collectors.toSet()); | 93 | Set<String> innerNoSet = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).collect(Collectors.toSet()); |
93 | - resultVo.setRate(sum.divide(new BigDecimal(innerNoSet.size())).doubleValue()); | 94 | + resultVo.setRate(sum.divide(new BigDecimal(innerNoSet.size()), Constant.TWO, RoundingMode.HALF_UP).doubleValue()); |
94 | } | 95 | } |
95 | return ServerResult.success(resultVo); | 96 | return ServerResult.success(resultVo); |
96 | } | 97 | } |