feat: 问题修复项

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

feat: 问题修复项
1、设计师权重导出 2、订单列表多选
谢茂盛
1 parent 070465c7
Showing 4 changed files with 101 additions and 44 deletions
src/main/java/com/order/erp/domain/vo/OrderReportStatExportVo.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
+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 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
+@ToString
+public class OrderReportStatExportVo implements Serializable {
+
+    /**
+     * 设计师
+     */
+    @ExcelField(title = "设计师", order = 1)
+    private String designer;
+
+    /**
+     * 想法来源占比
+     */
+    @ExcelField(title = "想法来源占比", order = 2)
+    private Double ideaSourceRate;
+
+    /**
+     * 手工初型1占比
+     */
+    @ExcelField(title = "手工初型1占比", order = 3)
+    private Double manualPreform1Rate;
+
+    /**
+     * 手工初型2占比
+     */
+    @ExcelField(title = "手工初型2占比", order = 4)
+    private Double manualPreform2Rate;
+}
@@ -43,7 +43,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 单据状态
      */
-    private String orderStatus;
+    private List<String> orderStatus;
     /**
      * 提交人名称
@@ -56,14 +56,14 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     private String commitUserPhone;
     /**
-     * 客户编码
+     * 项目号
      */
-    private String customerCode;
+    private List<String> projectNo;
     /**
-     * 项目号
+     * 客户编码集合
      */
-    private List<String> projectNo;
+    private List<String> customerCode;
     /**
      * 内部编号
@@ -73,7 +73,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 生产科
      */
-    private String productionDepartment;
+    private List<String> productionDepartment;
     /**
      * 生成科拖货开始时间
@@ -108,7 +108,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 想法来源
      */
-    private String ideaSource;
+    private List<String> ideaSource;
     /**
      * 想法来源占比
@@ -123,7 +123,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 手工初型1
      */
-    private String manualPreform1;
+    private List<String> manualPreform1;
     /**
      * 手工初型1占比
@@ -133,7 +133,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 手工初型2
      */
-    private String manualPreform2;
+    private List<String> manualPreform2;
     /**
      * 手工初型2占比
@@ -143,7 +143,7 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * pp样品确认意见
      */
-    private String ppConfirmResult;
+    private List<String> ppConfirmResult;
     /**
      * 自测通过开始时间
@@ -158,12 +158,12 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     /**
      * 中期验货结果PASS / FAIL
      */
-    private String midCheckResult;
+    private List<String> midCheckResult;
     /**
      * 尾期验货结果PASS / FAIL
      */
-    private String endCheckResult;
+    private List<String> endCheckResult;
     /**
      * 选择的字段
@@ -1266,12 +1266,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             } else {
                 orderIds.add(-1L);
             }
-        } else if (StringUtils.isNotBlank(queryVO.getIdeaSource()) || StringUtils.isNotBlank(queryVO.getManualPreform1()) || StringUtils.isNotBlank(queryVO.getManualPreform2())) {
+        } else if (CollectionUtils.isNotEmpty(queryVO.getIdeaSource()) || CollectionUtils.isNotEmpty(queryVO.getManualPreform1()) || CollectionUtils.isNotEmpty(queryVO.getManualPreform2())) {
             List<OrderCompletionReportDO> reportDOS = reportService.list(new LambdaQueryWrapper<OrderCompletionReportDO>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(StringUtils.isNotBlank(queryVO.getIdeaSource()), OrderCompletionReportDO::getIdeaSource, queryVO.getIdeaSource())
-                    .eq(StringUtils.isNotBlank(queryVO.getManualPreform2()), OrderCompletionReportDO::getManualPreform2, queryVO.getManualPreform2())
-                    .eq(StringUtils.isNotBlank(queryVO.getManualPreform1()), OrderCompletionReportDO::getManualPreform1, queryVO.getManualPreform1()));
+                    .in(CollectionUtils.isNotEmpty(queryVO.getIdeaSource()), OrderCompletionReportDO::getIdeaSource, queryVO.getIdeaSource())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getManualPreform2()), OrderCompletionReportDO::getManualPreform2, queryVO.getManualPreform2())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getManualPreform1()), OrderCompletionReportDO::getManualPreform1, queryVO.getManualPreform1()));
             if (CollectionUtils.isNotEmpty(reportDOS)) {
                 Set<Long> reportOrderIds = reportDOS.stream().map(OrderCompletionReportDO::getOrderId).collect(Collectors.toSet());
                 if (CollectionUtils.isNotEmpty(orderIds)) {
@@ -1289,10 +1289,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             }
         }
-        if (StringUtils.isNotBlank(queryVO.getPpConfirmResult()) || StringUtils.isNotBlank(queryVO.getSelfTestPassStartTime()) || StringUtils.isNotBlank(queryVO.getSelfTestPassEndTime())) {
+        if (CollectionUtils.isNotEmpty(queryVO.getPpConfirmResult()) || StringUtils.isNotBlank(queryVO.getSelfTestPassStartTime()) || StringUtils.isNotBlank(queryVO.getSelfTestPassEndTime())) {
             List<OrderTrackStageDO> trackStageDOS = trackStageService.list(new LambdaQueryWrapper<OrderTrackStageDO>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(StringUtils.isNotBlank(queryVO.getPpConfirmResult()), OrderTrackStageDO::getPpConfirmResult, queryVO.getPpConfirmResult())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getPpConfirmResult()), OrderTrackStageDO::getPpConfirmResult, queryVO.getPpConfirmResult())
                     .ge(StringUtils.isNotBlank(queryVO.getSelfTestPassStartTime()), OrderTrackStageDO::getSelfTestPassTime, queryVO.getSelfTestPassStartTime())
                     .le(StringUtils.isNotBlank(queryVO.getSelfTestPassEndTime()), OrderTrackStageDO::getSelfTestPassTime, queryVO.getSelfTestPassEndTime())
             );
@@ -1313,11 +1313,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             }
         }
-        if (StringUtils.isNotBlank(queryVO.getMidCheckResult()) || StringUtils.isNotBlank(queryVO.getEndCheckResult())) {
+        if (CollectionUtils.isNotEmpty(queryVO.getMidCheckResult()) || CollectionUtils.isNotEmpty(queryVO.getEndCheckResult())) {
             List<OrderInspectionStageDO> inspectionStageDOS = inspectionStageService.list(new LambdaQueryWrapper<OrderInspectionStageDO>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(StringUtils.isNotBlank(queryVO.getMidCheckResult()), OrderInspectionStageDO::getMidCheckResult, queryVO.getMidCheckResult())
-                    .eq(StringUtils.isNotBlank(queryVO.getEndCheckResult()), OrderInspectionStageDO::getEndCheckResult, queryVO.getEndCheckResult())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getMidCheckResult()), OrderInspectionStageDO::getMidCheckResult, queryVO.getMidCheckResult())
+                    .in(CollectionUtils.isNotEmpty(queryVO.getEndCheckResult()), OrderInspectionStageDO::getEndCheckResult, queryVO.getEndCheckResult())
             );
             if (CollectionUtils.isNotEmpty(inspectionStageDOS)) {
                 Set<Long> inspectOrderIds = inspectionStageDOS.stream().map(OrderInspectionStageDO::getOrderId).collect(Collectors.toSet());
@@ -1359,15 +1359,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
                 .eq(StringUtils.isNotBlank(queryVO.getCommitUserName()), OrderBaseInfoDO::getCreateBy, queryVO.getCommitUserName())
                 .ge(StringUtils.isNotBlank(queryVO.getCreateStartTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateStartTime())
                 .le(StringUtils.isNotBlank(queryVO.getCreateEndTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateEndTime())
-                .eq(StringUtils.isNotBlank(queryVO.getOrderStatus()), OrderBaseInfoDO::getOrderStatus, queryVO.getOrderStatus())
-                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .in(CollectionUtils.isNotEmpty(queryVO.getOrderStatus()), OrderBaseInfoDO::getOrderStatus, queryVO.getOrderStatus())
                 .in(CollectionUtils.isNotEmpty(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo())
                 .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
-                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                .in(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
                 .eq(StringUtils.isNotBlank(queryVO.getCreateBy()), OrderBaseInfoDO::getCreateBy, queryVO.getCreateBy())
                 .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
                 .ge(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignStartTime())
@@ -14,6 +14,7 @@ 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.OrderReportStatExportVo;
 import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportVO;
@@ -82,23 +83,24 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = orderBaseInfoService.buildQueryByParam(queryVO);
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
+            Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = new HashMap<>();
             Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+            Set<String> innerNoSet = new HashSet<>();
             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);
+                Map<Long, OrderCompletionReportDO> completionReportDOMap = new HashMap<>();
+                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());
                     }
-                    if (!exportVoMap.containsKey(reportDO.getIdeaSource())
-                            && !exportVoMap.containsKey(reportDO.getManualPreform1())
-                            && !exportVoMap.containsKey(reportDO.getManualPreform2())) {
+                }
+                for (OrderCompletionReportDO reportDO : reportDOS) {
+                    if (orderBaseInfoDOMap.containsKey(reportDO.getOrderId())) {
                         handlerExportMap(0, reportDO, exportVoMap);
                         handlerExportMap(1, reportDO, exportVoMap);
                         handlerExportMap(2, reportDO, exportVoMap);
@@ -107,7 +109,15 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
             }
             List<OrderReportAnalysisExportVo> exportVos = exportMap2exportList(exportVoMap);
             if (CollectionUtils.isNotEmpty(exportVos)) {
-                ExcelUtils.getInstance().exportObjects2Excel(exportVos, OrderReportAnalysisExportVo.class, response.getOutputStream());
+                List<OrderReportStatExportVo> statExportVos = exportVos.stream().map(x -> {
+                    OrderReportStatExportVo statExportVo = new OrderReportStatExportVo();
+                    statExportVo.setDesigner(x.getDesigner());
+                    statExportVo.setIdeaSourceRate(x.getIdeaSourceRate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
+                    statExportVo.setManualPreform1Rate(x.getManualPreform1Rate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
+                    statExportVo.setManualPreform2Rate(x.getManualPreform2Rate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
+                    return statExportVo;
+                }).collect(Collectors.toList());
+                ExcelUtils.getInstance().exportObjects2Excel(statExportVos, OrderReportStatExportVo.class, response.getOutputStream());
             }
         }
@@ -162,14 +172,14 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
         if (Objects.isNull(exportVo.getManualPreform2Rate())) {
             exportVo.setManualPreform2Rate(new BigDecimal(0));
         }
-        if (Objects.nonNull(reportDO.getIdeaSourceRate())) {
-            exportVo.setIdeaSourceRate(new BigDecimal(reportDO.getIdeaSourceRate()).add(exportVo.getIdeaSourceRate()));
+        if (key.equals(reportDO.getIdeaSource())) {
+            exportVo.setIdeaSourceRate(new BigDecimal(Objects.nonNull(reportDO.getIdeaSourceRate()) ? reportDO.getIdeaSourceRate() : 0).add(exportVo.getIdeaSourceRate()));
         }
-        if (Objects.nonNull(reportDO.getManualPreform1Rate())) {
-            exportVo.setManualPreform1Rate(new BigDecimal(reportDO.getManualPreform1Rate()).add(exportVo.getManualPreform1Rate()));
+        if (key.equals(reportDO.getManualPreform1())) {
+            exportVo.setManualPreform1Rate(new BigDecimal(Objects.nonNull(reportDO.getManualPreform1Rate()) ? reportDO.getManualPreform1Rate() : 0).add(exportVo.getManualPreform1Rate()));
         }
-        if (Objects.nonNull(reportDO.getManualPreform2Rate())) {
-            exportVo.setManualPreform2Rate(new BigDecimal(reportDO.getManualPreform2Rate()).add(exportVo.getManualPreform2Rate()));
+        if (key.equals(reportDO.getManualPreform2())) {
+            exportVo.setManualPreform2Rate(new BigDecimal(Objects.nonNull(reportDO.getManualPreform2Rate()) ? reportDO.getManualPreform2Rate() : 0).add(exportVo.getManualPreform2Rate()));
         }
         exportVoMap.put(key, exportVo);
     }