feat: 问题修复项

1、设计师权重导出 2、订单列表多选

feat: 问题修复项
1、设计师权重导出 2、订单列表多选
谢茂盛
1 parent 9eeb9d1e
Showing 2 changed files with 56 additions and 11 deletions
src/main/java/com/order/erp/domain/vo/order/OrderReportResultVO.java
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.order.OrderCompletionReportDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 订单基础信息表(OrderBaseInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:26:43
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderReportResultVO implements Serializable {
+
+    private List<OrderBaseInfoDO> orderBaseInfoDOList;
+
+    private List<OrderCompletionReportDO> reportDOS;
+}
@@ -89,6 +89,7 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
             List<OrderCompletionReportDO> reportDOS = list(new LambdaQueryWrapper<OrderCompletionReportDO>().in(OrderCompletionReportDO::getOrderId, orderIds));
             Map<String, OrderReportAnalysisExportVo> exportVoMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(reportDOS)) {
+                orderBaseInfoDOList = filterBaseData(orderBaseInfoDOList, reportDOS);
                 Map<Long, OrderCompletionReportDO> completionReportDOMap = new HashMap<>();
                 completionReportDOMap = reportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (x, y) -> x));
                 for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOList) {
@@ -100,11 +101,9 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
                     }
                 }
                 for (OrderCompletionReportDO reportDO : reportDOS) {
-                    if (orderBaseInfoDOMap.containsKey(reportDO.getOrderId())) {
-                        handlerExportMap(0, reportDO, exportVoMap);
-                        handlerExportMap(1, reportDO, exportVoMap);
-                        handlerExportMap(2, reportDO, exportVoMap);
-                    }
+                    handlerExportMap(0, reportDO, exportVoMap);
+                    handlerExportMap(1, reportDO, exportVoMap);
+                    handlerExportMap(2, reportDO, exportVoMap);
                 }
             }
             List<OrderReportAnalysisExportVo> exportVos = exportMap2exportList(exportVoMap);
@@ -198,6 +197,7 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
             BigDecimal sum = new BigDecimal(0);
             Map<Long, OrderCompletionReportDO> completionReportDOMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(reportDOS)) {
+                orderBaseInfoDOList = filterBaseData(orderBaseInfoDOList, reportDOS);
                 completionReportDOMap = reportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (x, y) -> x));
                 for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOList) {
                     if (completionReportDOMap.containsKey(orderBaseInfoDO.getId())) {
@@ -208,12 +208,10 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
                     }
                 }
                 for (OrderCompletionReportDO reportDO : reportDOS) {
-                    if (orderBaseInfoDOMap.containsKey(reportDO.getOrderId())) {
-                        Double ideaSourceRate = queryVO.getDesigner().equals(reportDO.getIdeaSource()) && Objects.nonNull(reportDO.getIdeaSourceRate()) ? reportDO.getIdeaSourceRate() : 0;
-                        Double manualPreform1Rate = queryVO.getDesigner().equals(reportDO.getManualPreform1()) && Objects.nonNull(reportDO.getManualPreform1Rate()) ? reportDO.getManualPreform1Rate() : 0;
-                        Double manualPreform2Rate = queryVO.getDesigner().equals(reportDO.getManualPreform2()) && Objects.nonNull(reportDO.getManualPreform2Rate()) ? reportDO.getManualPreform2Rate() : 0;
-                        sum = sum.add(new BigDecimal(ideaSourceRate)).add(new BigDecimal(manualPreform1Rate)).add(new BigDecimal(manualPreform2Rate));
-                    }
+                    Double ideaSourceRate = queryVO.getDesigner().equals(reportDO.getIdeaSource()) && Objects.nonNull(reportDO.getIdeaSourceRate()) ? reportDO.getIdeaSourceRate() : 0;
+                    Double manualPreform1Rate = queryVO.getDesigner().equals(reportDO.getManualPreform1()) && Objects.nonNull(reportDO.getManualPreform1Rate()) ? reportDO.getManualPreform1Rate() : 0;
+                    Double manualPreform2Rate = queryVO.getDesigner().equals(reportDO.getManualPreform2()) && Objects.nonNull(reportDO.getManualPreform2Rate()) ? reportDO.getManualPreform2Rate() : 0;
+                    sum = sum.add(new BigDecimal(ideaSourceRate)).add(new BigDecimal(manualPreform1Rate)).add(new BigDecimal(manualPreform2Rate));
                 }
             }
             resultVo.setRate(sum.divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
@@ -222,6 +220,25 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
     }
     /**
+     * @param orderBaseInfoDOList
+     * @param reportDOS
+     * @return
+     */
+    private List<OrderBaseInfoDO> filterBaseData(List<OrderBaseInfoDO> orderBaseInfoDOList, List<OrderCompletionReportDO> reportDOS) {
+        List<OrderBaseInfoDO> result = new ArrayList<>();
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return result;
+        }
+        Map<Long, OrderBaseInfoDO> map = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        for (OrderCompletionReportDO reportDO : reportDOS) {
+            if (map.containsKey(reportDO.getOrderId())) {
+                result.add(map.get(reportDO.getOrderId()));
+            }
+        }
+        return result;
+    }
+
+    /**
      * 新增数据
      *
      * @param orderCompletionReportVO 实例对象