canrd-outside / order-erp · Commits

Commit 6037afa14b3cca4bb5472dab556a5bb7bb0a9b10

Authored by 谢茂盛
1 parent 1464aebd
build: skipped

feat: 问题修复项 

1、内部编号处理 '-' 通过接口刷数据处理
2、计算利润率支持全选(根据页面查询条件)
3、计算设计师权重分母对内部编码去重
Inline Side-by-side
Showing 3 changed files with 19 additions and 3 deletions
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
  View file @6037afa
... ... @@ -23,7 +23,7 @@ import java.util.List;
23 23 @NoArgsConstructor
24 24 @ToString
25 25 public class OrderProfitAnalysisVo implements Serializable {
26   - @Size(min = 1, message = "订单不能为空")
  26 +
27 27 private List<Long> orderIds;
28 28  
29 29 /**
... ...
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java
  View file @6037afa
1 1 package com.order.erp.domain.vo.order;
2 2  
3   -import io.swagger.annotations.ApiModelProperty;
4 3 import lombok.*;
5 4 import lombok.experimental.SuperBuilder;
6 5  
... ... @@ -102,5 +101,14 @@ public class OrderProfitAnalysisVO implements Serializable {
102 101 */
103 102 private Boolean isEditPacketPrice;
104 103  
  104 + /**
  105 + * 订单总数
  106 + */
  107 + private Integer orderTotalNum;
  108 +
  109 + /**
  110 + * 记录数
  111 + */
  112 + private Integer recordNum;
105 113  
106 114 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
  View file @6037afa
... ... @@ -220,7 +220,13 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
220 220 customerTotalPrice = customerTotalPrice.add(new BigDecimal(orderProfit.getCustomerTotalPrice()));
221 221 productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(new BigDecimal(orderProfit.getProductionDepartmentTotalPrice()));
222 222 }
223   -
  223 + List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoService.listByIds(orderProfits.stream().map(OrderProfitAnalysisDO::getOrderId).collect(Collectors.toSet()));
  224 + int orderTotalNum = 0;
  225 + for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOS) {
  226 + if (Objects.nonNull(orderBaseInfoDO.getOrderCount())) {
  227 + orderTotalNum += orderBaseInfoDO.getOrderCount();
  228 + }
  229 + }
224 230 OrderProfitAnalysisVO profitAnalysisVO = new OrderProfitAnalysisVO();
225 231 profitAnalysisVO.setPacketTotalPrice(packetTotalPrice.doubleValue());
226 232 profitAnalysisVO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
... ... @@ -231,6 +237,8 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
231 237 .productionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue())
232 238 .packetTotalPrice(packetTotalPrice.doubleValue())
233 239 .customerTotalPrice(customerTotalPrice.doubleValue()).build()));
  240 + profitAnalysisVO.setOrderTotalNum(orderTotalNum);
  241 + profitAnalysisVO.setRecordNum(orderProfits.size());
234 242  
235 243 return ServerResult.success(profitAnalysisVO);
236 244 }
... ...