feat: 问题修复项

1、内部编号处理 '-' 通过接口刷数据处理 2、计算利润率支持全选(根据页面查询条件) 3、计算设计师权重分母对内部编码去重

feat: 问题修复项
1、内部编号处理 '-' 通过接口刷数据处理 2、计算利润率支持全选(根据页面查询条件) 3、计算设计师权重分母对内部编码去重
谢茂盛
1 parent 1464aebd
Showing 3 changed files with 19 additions and 3 deletions
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.List;
 @NoArgsConstructor
 @ToString
 public class OrderProfitAnalysisVo implements Serializable {
-    @Size(min = 1, message = "订单不能为空")
+
     private List<Long> orderIds;
     /**
 package com.order.erp.domain.vo.order;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -102,5 +101,14 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private Boolean isEditPacketPrice;
+    /**
+     * 订单总数
+     */
+    private Integer orderTotalNum;
+
+    /**
+     * 记录数
+     */
+    private Integer recordNum;
 }
@@ -220,7 +220,13 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
             customerTotalPrice = customerTotalPrice.add(new BigDecimal(orderProfit.getCustomerTotalPrice()));
             productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(new BigDecimal(orderProfit.getProductionDepartmentTotalPrice()));
         }
-
+        List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoService.listByIds(orderProfits.stream().map(OrderProfitAnalysisDO::getOrderId).collect(Collectors.toSet()));
+        int orderTotalNum = 0;
+        for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOS) {
+            if (Objects.nonNull(orderBaseInfoDO.getOrderCount())) {
+                orderTotalNum += orderBaseInfoDO.getOrderCount();
+            }
+        }
         OrderProfitAnalysisVO profitAnalysisVO = new OrderProfitAnalysisVO();
         profitAnalysisVO.setPacketTotalPrice(packetTotalPrice.doubleValue());
         profitAnalysisVO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
@@ -231,6 +237,8 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
                 .productionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue())
                 .packetTotalPrice(packetTotalPrice.doubleValue())
                 .customerTotalPrice(customerTotalPrice.doubleValue()).build()));
+        profitAnalysisVO.setOrderTotalNum(orderTotalNum);
+        profitAnalysisVO.setRecordNum(orderProfits.size());
         return ServerResult.success(profitAnalysisVO);
     }