feat: 问题修复项

1、设计师权重导出

feat: 问题修复项
1、设计师权重导出
谢茂盛
1 parent 5293b948
Showing 4 changed files with 184 additions and 10 deletions
src/main/java/com/order/erp/controller/OrderReportController.java
src/main/java/com/order/erp/domain/vo/OrderReportAnalysisExportVo.java
src/main/java/com/order/erp/service/order/OrderCompletionReportService.java
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
 package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
-import com.order.erp.domain.vo.OrderReportAnalysisVo;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
 import com.order.erp.service.order.OrderCompletionReportService;
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 /**
  * @author xms
@@ -31,4 +33,9 @@ public class OrderReportController {
     public ServerResult<OrderProfitAnalysisVO> analysis(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
         return orderCompletionReportService.analysis(queryVO);
     }
+
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody @Validated OrderBaseInfoQueryVO queryVO) throws IOException, Excel4JException {
+        orderCompletionReportService.export(response, queryVO);
+    }
 }
+package com.order.erp.domain.vo;
+
+import com.order.erp.common.excel4j.annotation.ExcelField;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author zhongnanhuang
+ * @version 1.0
+ * @project order-erp
+ * @description 利润分析传参
+ * @date 2023/10/30 10:19:26
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+@ToString
+public class OrderReportAnalysisExportVo implements Serializable {
+
+    /**
+     * 设计师
+     */
+    @ExcelField(title = "设计师", order = 1)
+    private String designer;
+
+    /**
+     * 想法来源占比
+     */
+    @ExcelField(title = "想法来源占比", order = 2)
+    private BigDecimal ideaSourceRate;
+
+    /**
+     * 手工初型1占比
+     */
+    @ExcelField(title = "手工初型1占比", order = 3)
+    private BigDecimal manualPreform1Rate;
+
+    /**
+     * 手工初型2占比
+     */
+    @ExcelField(title = "手工初型2占比", order = 4)
+    private BigDecimal manualPreform2Rate;
+}
@@ -2,12 +2,15 @@ package com.order.erp.service.order;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.dto.order.OrderCompletionReportDO;
 import com.order.erp.domain.vo.OrderReportAnalysisVo;
 import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportVO;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 /**
@@ -36,12 +39,20 @@ public interface OrderCompletionReportService extends IService&lt;OrderCompletionRe
     /**
-     * @param reportAnalysisVo
+     * @param queryVO
      * @return
      */
     ServerResult analysis(OrderBaseInfoQueryVO queryVO);
     /**
+     *
+     * @param response
+     * @param orderBaseInfoQueryVO
+     * @return
+     */
+    ServerResult export(HttpServletResponse response, OrderBaseInfoQueryVO orderBaseInfoQueryVO) throws IOException, Excel4JException;
+
+    /**
      * 新增数据
      *
      * @param orderCompletionReportVO 数据VO
@@ -8,8 +8,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.excel4j.ExcelUtils;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.OrderCompletionReportDO;
+import com.order.erp.domain.vo.OrderReportAnalysisExportVo;
 import com.order.erp.domain.vo.OrderReportAnalysisResultVo;
 import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
@@ -21,11 +24,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 /**
@@ -74,23 +78,125 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
     }
     @Override
+    public ServerResult export(HttpServletResponse response, OrderBaseInfoQueryVO queryVO) throws IOException, Excel4JException {
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = orderBaseInfoService.buildQueryByParam(queryVO);
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
+            Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+            List<OrderCompletionReportDO> reportDOS = list(new LambdaQueryWrapper<OrderCompletionReportDO>().in(OrderCompletionReportDO::getOrderId, orderIds));
+            Map<String, OrderReportAnalysisExportVo> exportVoMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(reportDOS)) {
+                for (OrderCompletionReportDO reportDO : reportDOS) {
+                    if (exportVoMap.containsKey(reportDO.getIdeaSource())) {
+                        handlerExportMap(0, reportDO, exportVoMap);
+                    }
+                    if (exportVoMap.containsKey(reportDO.getManualPreform1())) {
+                        handlerExportMap(1, reportDO, exportVoMap);
+                    }
+                    if (exportVoMap.containsKey(reportDO.getManualPreform2())) {
+                        handlerExportMap(2, reportDO, exportVoMap);
+                    }
+                    if (!exportVoMap.containsKey(reportDO.getIdeaSource())
+                            && !exportVoMap.containsKey(reportDO.getManualPreform1())
+                            && !exportVoMap.containsKey(reportDO.getManualPreform2())) {
+                        handlerExportMap(0, reportDO, exportVoMap);
+                        handlerExportMap(1, reportDO, exportVoMap);
+                        handlerExportMap(2, reportDO, exportVoMap);
+                    }
+                }
+            }
+            List<OrderReportAnalysisExportVo> exportVos = exportMap2exportList(exportVoMap);
+            if (CollectionUtils.isNotEmpty(exportVos)) {
+                ExcelUtils.getInstance().exportObjects2Excel(exportVos, OrderReportAnalysisExportVo.class, response.getOutputStream());
+            }
+        }
+
+        return ServerResult.success();
+    }
+
+    /**
+     * @param exportVoMap
+     * @return
+     */
+    private List<OrderReportAnalysisExportVo> exportMap2exportList(Map<String, OrderReportAnalysisExportVo> exportVoMap) {
+        List<OrderReportAnalysisExportVo> exportVos = new ArrayList<>();
+        if (CollectionUtils.isEmpty(exportVoMap)) {
+            return exportVos;
+        }
+        for (Map.Entry<String, OrderReportAnalysisExportVo> exportVoEntry : exportVoMap.entrySet()) {
+            String key = exportVoEntry.getKey();
+            OrderReportAnalysisExportVo exportVo = exportVoEntry.getValue();
+            exportVo.setDesigner(key);
+            exportVos.add(exportVo);
+        }
+        return exportVos;
+    }
+
+    /**
+     * @param reportDO
+     * @param exportVoMap
+     */
+    private void handlerExportMap(Integer type, OrderCompletionReportDO reportDO, Map<String, OrderReportAnalysisExportVo> exportVoMap) {
+        OrderReportAnalysisExportVo exportVo = OrderReportAnalysisExportVo.builder()
+                .ideaSourceRate(new BigDecimal(0))
+                .manualPreform1Rate(new BigDecimal(0))
+                .manualPreform2Rate(new BigDecimal(0)).build();
+        String key = null;
+        if (type == 0) {
+            key = reportDO.getIdeaSource();
+
+        }
+        if (type == 1) {
+            key = reportDO.getManualPreform1();
+        }
+        if (type == 2) {
+            key = reportDO.getManualPreform2();
+        }
+        exportVo = exportVoMap.get(key);
+        if (Objects.nonNull(reportDO.getIdeaSourceRate())) {
+            exportVo.setIdeaSourceRate(new BigDecimal(reportDO.getIdeaSourceRate()).add(exportVo.getIdeaSourceRate()));
+        }
+        if (Objects.nonNull(reportDO.getManualPreform1Rate())) {
+            exportVo.setManualPreform1Rate(new BigDecimal(reportDO.getManualPreform1Rate()).add(exportVo.getManualPreform1Rate()));
+        }
+        if (Objects.nonNull(reportDO.getManualPreform2Rate())) {
+            exportVo.setManualPreform2Rate(new BigDecimal(reportDO.getManualPreform2Rate()).add(exportVo.getManualPreform2Rate()));
+        }
+        exportVoMap.put(key, exportVo);
+    }
+
+    @Override
     public ServerResult analysis(OrderBaseInfoQueryVO queryVO) {
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = orderBaseInfoService.buildQueryByParam(queryVO);
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
         OrderReportAnalysisResultVo resultVo = new OrderReportAnalysisResultVo();
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = new HashMap<>();
+        Set<String> innerNoSet = new HashSet<>();
         if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
+
             Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
             List<OrderCompletionReportDO> reportDOS = list(new LambdaQueryWrapper<OrderCompletionReportDO>().in(OrderCompletionReportDO::getOrderId, orderIds));
             BigDecimal sum = new BigDecimal(0);
+            Map<Long, OrderCompletionReportDO> completionReportDOMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(reportDOS)) {
+                completionReportDOMap = reportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (x, y) -> x));
+                for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOList) {
+                    if (completionReportDOMap.containsKey(orderBaseInfoDO.getId())) {
+                        if (!innerNoSet.contains(orderBaseInfoDO.getInnerNo())) {
+                            orderBaseInfoDOMap.put(orderBaseInfoDO.getId(), orderBaseInfoDO);
+                        }
+                        innerNoSet.add(orderBaseInfoDO.getInnerNo());
+                    }
+                }
                 for (OrderCompletionReportDO reportDO : reportDOS) {
-                    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));
+                    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));
+                    }
                 }
             }
-            Set<String> innerNoSet = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).collect(Collectors.toSet());
             resultVo.setRate(sum.divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
         }
         return ServerResult.success(resultVo);